lib/cutego
1
0
Fork 0
mirror of https://github.com/bluszcz/cutego.git synced 2024-09-28 13:15:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix for js/wasm + make fast deployments possible for js/wasm docker images

Browse source
This commit is contained in:
therecipe 2018-11-18 04:08:14 +01:00
parent f90e95d948
commit 9885bf8662
9 changed files with 48 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/qtdeploy/main.go
View file

@ -103,6 +103,9 @@ func main() {
if !(target == runtime.GOOS || target == "js" || target == "wasm") {
fast = false
}
if (docker || vagrant) && !(target == "js" || target == "wasm") {
fast = false
}
if !filepath.IsAbs(path) {
path, err = filepath.Abs(path)
@ -116,5 +119,5 @@ func main() {
}
utils.CheckBuildTarget(target)
deploy.Deploy(mode, target, path, docker, ldFlags, tags, fast && !(docker || vagrant), device, vagrant, vagrant_system, comply)
deploy.Deploy(mode, target, path, docker, ldFlags, tags, fast, device, vagrant, vagrant_system, comply)
}

12
core/core.cpp
View file

@ -11356,9 +11356,9 @@ double QLineF_Y2(void* ptr)
return static_cast<QLineF*>(ptr)->y2();
}
struct QtCore_PackedList QLocale_QLocale_MatchingLocales(long long language, long long script, long long country)
struct QtCore_PackedList QLocale_QLocale_MatchingLocales(long long language, long long scri, long long country)
{
return ({ QList<QLocale>* tmpValue = new QList<QLocale>(QLocale::matchingLocales(static_cast<QLocale::Language>(language), static_cast<QLocale::Script>(script), static_cast<QLocale::Country>(country))); QtCore_PackedList { tmpValue, tmpValue->size() }; });
return ({ QList<QLocale>* tmpValue = new QList<QLocale>(QLocale::matchingLocales(static_cast<QLocale::Language>(language), static_cast<QLocale::Script>(scri), static_cast<QLocale::Country>(country))); QtCore_PackedList { tmpValue, tmpValue->size() }; });
}
void* QLocale_QLocale_C()
@ -11381,9 +11381,9 @@ void* QLocale_NewQLocale3(long long language, long long country)
return new QLocale(static_cast<QLocale::Language>(language), static_cast<QLocale::Country>(country));
}
void* QLocale_NewQLocale4(long long language, long long script, long long country)
void* QLocale_NewQLocale4(long long language, long long scri, long long country)
{
return new QLocale(static_cast<QLocale::Language>(language), static_cast<QLocale::Script>(script), static_cast<QLocale::Country>(country));
return new QLocale(static_cast<QLocale::Language>(language), static_cast<QLocale::Script>(scri), static_cast<QLocale::Country>(country));
}
void* QLocale_NewQLocale5(void* other)
@ -11411,9 +11411,9 @@ struct QtCore_PackedString QLocale_QLocale_LanguageToString(long long language)
return ({ QByteArray t29d017 = QLocale::languageToString(static_cast<QLocale::Language>(language)).toUtf8(); QtCore_PackedString { const_cast<char*>(t29d017.prepend("WHITESPACE").constData()+10), t29d017.size()-10 }; });
}
struct QtCore_PackedString QLocale_QLocale_ScriptToString(long long script)
struct QtCore_PackedString QLocale_QLocale_ScriptToString(long long scri)
{
return ({ QByteArray tfce283 = QLocale::scriptToString(static_cast<QLocale::Script>(script)).toUtf8(); QtCore_PackedString { const_cast<char*>(tfce283.prepend("WHITESPACE").constData()+10), tfce283.size()-10 }; });
return ({ QByteArray t535509 = QLocale::scriptToString(static_cast<QLocale::Script>(scri)).toUtf8(); QtCore_PackedString { const_cast<char*>(t535509.prepend("WHITESPACE").constData()+10), t535509.size()-10 }; });
}
void QLocale_QLocale_SetDefault(void* locale)

20
core/core.go
View file

@ -25293,7 +25293,7 @@ const (
QLocale__LastScript QLocale__Script = QLocale__Script(QLocale__JamoScript)
)
func QLocale_MatchingLocales(language QLocale__Language, script QLocale__Script, country QLocale__Country) []*QLocale {
func QLocale_MatchingLocales(language QLocale__Language, scri QLocale__Script, country QLocale__Country) []*QLocale {
return func(l C.struct_QtCore_PackedList) []*QLocale {
out := make([]*QLocale, int(l.len))
tmpList := NewQLocaleFromPointer(l.data)
@ -25301,10 +25301,10 @@ func QLocale_MatchingLocales(language QLocale__Language, script QLocale__Script,
out[i] = tmpList.__matchingLocales_atList(i)
}
return out
}(C.QLocale_QLocale_MatchingLocales(C.longlong(language), C.longlong(script), C.longlong(country)))
}(C.QLocale_QLocale_MatchingLocales(C.longlong(language), C.longlong(scri), C.longlong(country)))
}
func (ptr *QLocale) MatchingLocales(language QLocale__Language, script QLocale__Script, country QLocale__Country) []*QLocale {
func (ptr *QLocale) MatchingLocales(language QLocale__Language, scri QLocale__Script, country QLocale__Country) []*QLocale {
return func(l C.struct_QtCore_PackedList) []*QLocale {
out := make([]*QLocale, int(l.len))
tmpList := NewQLocaleFromPointer(l.data)
@ -25312,7 +25312,7 @@ func (ptr *QLocale) MatchingLocales(language QLocale__Language, script QLocale__
out[i] = tmpList.__matchingLocales_atList(i)
}
return out
}(C.QLocale_QLocale_MatchingLocales(C.longlong(language), C.longlong(script), C.longlong(country)))
}(C.QLocale_QLocale_MatchingLocales(C.longlong(language), C.longlong(scri), C.longlong(country)))
}
func QLocale_C() *QLocale {
@ -25351,8 +25351,8 @@ func NewQLocale3(language QLocale__Language, country QLocale__Country) *QLocale
return tmpValue
}
func NewQLocale4(language QLocale__Language, script QLocale__Script, country QLocale__Country) *QLocale {
tmpValue := NewQLocaleFromPointer(C.QLocale_NewQLocale4(C.longlong(language), C.longlong(script), C.longlong(country)))
func NewQLocale4(language QLocale__Language, scri QLocale__Script, country QLocale__Country) *QLocale {
tmpValue := NewQLocaleFromPointer(C.QLocale_NewQLocale4(C.longlong(language), C.longlong(scri), C.longlong(country)))
runtime.SetFinalizer(tmpValue, (*QLocale).DestroyQLocale)
return tmpValue
}
@ -25397,12 +25397,12 @@ func (ptr *QLocale) LanguageToString(language QLocale__Language) string {
return cGoUnpackString(C.QLocale_QLocale_LanguageToString(C.longlong(language)))
}
func QLocale_ScriptToString(script QLocale__Script) string {
return cGoUnpackString(C.QLocale_QLocale_ScriptToString(C.longlong(script)))
func QLocale_ScriptToString(scri QLocale__Script) string {
return cGoUnpackString(C.QLocale_QLocale_ScriptToString(C.longlong(scri)))
}
func (ptr *QLocale) ScriptToString(script QLocale__Script) string {
return cGoUnpackString(C.QLocale_QLocale_ScriptToString(C.longlong(script)))
func (ptr *QLocale) ScriptToString(scri QLocale__Script) string {
return cGoUnpackString(C.QLocale_QLocale_ScriptToString(C.longlong(scri)))
}
func QLocale_SetDefault(locale QLocale_ITF) {

6
core/core.h
View file

@ -1750,18 +1750,18 @@ double QLineF_X1(void* ptr);
double QLineF_X2(void* ptr);
double QLineF_Y1(void* ptr);
double QLineF_Y2(void* ptr);
struct QtCore_PackedList QLocale_QLocale_MatchingLocales(long long language, long long script, long long country);
struct QtCore_PackedList QLocale_QLocale_MatchingLocales(long long language, long long scri, long long country);
void* QLocale_QLocale_C();
void* QLocale_QLocale_System();
void* QLocale_NewQLocale();
void* QLocale_NewQLocale3(long long language, long long country);
void* QLocale_NewQLocale4(long long language, long long script, long long country);
void* QLocale_NewQLocale4(long long language, long long scri, long long country);
void* QLocale_NewQLocale5(void* other);
void* QLocale_NewQLocale2(struct QtCore_PackedString name);
struct QtCore_PackedString QLocale_QLocale_CountryToString(long long country);
struct QtCore_PackedString QLocale_FormattedDataSize(void* ptr, long long bytes, int precision, long long format);
struct QtCore_PackedString QLocale_QLocale_LanguageToString(long long language);
struct QtCore_PackedString QLocale_QLocale_ScriptToString(long long script);
struct QtCore_PackedString QLocale_QLocale_ScriptToString(long long scri);
void QLocale_QLocale_SetDefault(void* locale);
void QLocale_SetNumberOptions(void* ptr, long long options);
void QLocale_Swap(void* ptr, void* other);

3
internal/binding/parser/helper.go
View file

@ -141,7 +141,8 @@ func CleanName(name, value string) string {
"log",
"runtime",
"time",
"hex":
"hex",
"script":
{
return name[:len(name)-2]
}

2
internal/cmd/deploy/deploy.go
View file

@ -58,7 +58,7 @@ func Deploy(mode, target, path string, docker bool, ldFlags, tags string, fast b
moc.Moc(path, target, tags, false, false)
}
if (!fast || utils.QT_STUB()) && !utils.QT_FAT() {
if ((!fast || utils.QT_STUB()) || ((target == "js" || target == "wasm") && (utils.QT_DOCKER() || utils.QT_VAGRANT()))) && !utils.QT_FAT() {
minimal.Minimal(path, target, tags)
}

38
qml/qml.cpp
View file

@ -2168,7 +2168,7 @@ class MyQQmlExpression: public QQmlExpression
public:
MyQQmlExpression() : QQmlExpression() {QQmlExpression_QQmlExpression_QRegisterMetaType();};
MyQQmlExpression(QQmlContext *ctxt, QObject *scope, const QString &expression, QObject *parent = Q_NULLPTR) : QQmlExpression(ctxt, scope, expression, parent) {QQmlExpression_QQmlExpression_QRegisterMetaType();};
MyQQmlExpression(const QQmlScriptString &script, QQmlContext *ctxt = Q_NULLPTR, QObject *scope = Q_NULLPTR, QObject *parent = Q_NULLPTR) : QQmlExpression(script, ctxt, scope, parent) {QQmlExpression_QQmlExpression_QRegisterMetaType();};
MyQQmlExpression(const QQmlScriptString &scri, QQmlContext *ctxt = Q_NULLPTR, QObject *scope = Q_NULLPTR, QObject *parent = Q_NULLPTR) : QQmlExpression(scri, ctxt, scope, parent) {QQmlExpression_QQmlExpression_QRegisterMetaType();};
void Signal_ValueChanged() { callbackQQmlExpression_ValueChanged(this); };
~MyQQmlExpression() { callbackQQmlExpression_DestroyQQmlExpression(this); };
const QMetaObject * metaObject() const { return static_cast<QMetaObject*>(callbackQQmlExpression_MetaObject(const_cast<void*>(static_cast<const void*>(this)))); };
@ -2232,42 +2232,42 @@ void* QQmlExpression_NewQQmlExpression2(void* ctxt, void* scope, struct QtQml_Pa
}
}
void* QQmlExpression_NewQQmlExpression3(void* script, void* ctxt, void* scope, void* parent)
void* QQmlExpression_NewQQmlExpression3(void* scri, void* ctxt, void* scope, void* parent)
{
if (dynamic_cast<QCameraImageCapture*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QCameraImageCapture*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QCameraImageCapture*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QDBusPendingCallWatcher*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QDBusPendingCallWatcher*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QDBusPendingCallWatcher*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QExtensionFactory*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QExtensionFactory*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QExtensionFactory*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QExtensionManager*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QExtensionManager*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QExtensionManager*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QGraphicsObject*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QGraphicsObject*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QGraphicsObject*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QGraphicsWidget*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QGraphicsWidget*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QGraphicsWidget*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QLayout*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QLayout*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QLayout*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QMediaPlaylist*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QMediaPlaylist*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QMediaPlaylist*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QMediaRecorder*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QMediaRecorder*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QMediaRecorder*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QOffscreenSurface*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QOffscreenSurface*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QOffscreenSurface*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QPaintDeviceWindow*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QPaintDeviceWindow*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QPaintDeviceWindow*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QPdfWriter*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QPdfWriter*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QPdfWriter*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QQuickItem*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QQuickItem*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QQuickItem*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QRadioData*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QRadioData*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QRadioData*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QWidget*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QWidget*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QWidget*>(scope), static_cast<QObject*>(parent));
} else if (dynamic_cast<QWindow*>(static_cast<QObject*>(scope))) {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QWindow*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QWindow*>(scope), static_cast<QObject*>(parent));
} else {
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(script), static_cast<QQmlContext*>(ctxt), static_cast<QObject*>(scope), static_cast<QObject*>(parent));
return new MyQQmlExpression(*static_cast<QQmlScriptString*>(scri), static_cast<QQmlContext*>(ctxt), static_cast<QObject*>(scope), static_cast<QObject*>(parent));
}
}

4
qml/qml.go
View file

@ -3842,8 +3842,8 @@ func NewQQmlExpression2(ctxt QQmlContext_ITF, scope core.QObject_ITF, expression
return tmpValue
}
func NewQQmlExpression3(script QQmlScriptString_ITF, ctxt QQmlContext_ITF, scope core.QObject_ITF, parent core.QObject_ITF) *QQmlExpression {
tmpValue := NewQQmlExpressionFromPointer(C.QQmlExpression_NewQQmlExpression3(PointerFromQQmlScriptString(script), PointerFromQQmlContext(ctxt), core.PointerFromQObject(scope), core.PointerFromQObject(parent)))
func NewQQmlExpression3(scri QQmlScriptString_ITF, ctxt QQmlContext_ITF, scope core.QObject_ITF, parent core.QObject_ITF) *QQmlExpression {
tmpValue := NewQQmlExpressionFromPointer(C.QQmlExpression_NewQQmlExpression3(PointerFromQQmlScriptString(scri), PointerFromQQmlContext(ctxt), core.PointerFromQObject(scope), core.PointerFromQObject(parent)))
if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") {
tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) })
}

2
qml/qml.h
View file

@ -316,7 +316,7 @@ int QQmlError_Column(void* ptr);
int QQmlError_Line(void* ptr);
void* QQmlExpression_NewQQmlExpression();
void* QQmlExpression_NewQQmlExpression2(void* ctxt, void* scope, struct QtQml_PackedString expression, void* parent);
void* QQmlExpression_NewQQmlExpression3(void* script, void* ctxt, void* scope, void* parent);
void* QQmlExpression_NewQQmlExpression3(void* scri, void* ctxt, void* scope, void* parent);
struct QtQml_PackedString QQmlExpression_QQmlExpression_Tr(char* s, char* c, int n);
struct QtQml_PackedString QQmlExpression_QQmlExpression_TrUtf8(char* s, char* c, int n);
void* QQmlExpression_Evaluate(void* ptr, char* valueIsUndefined);