diff --git a/cmd/qtdeploy/main.go b/cmd/qtdeploy/main.go index 6d49a3af..ca2d810b 100644 --- a/cmd/qtdeploy/main.go +++ b/cmd/qtdeploy/main.go @@ -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) } diff --git a/core/core.cpp b/core/core.cpp index e54c3b9f..f7136cc8 100644 --- a/core/core.cpp +++ b/core/core.cpp @@ -11356,9 +11356,9 @@ double QLineF_Y2(void* ptr) return static_cast(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* tmpValue = new QList(QLocale::matchingLocales(static_cast(language), static_cast(script), static_cast(country))); QtCore_PackedList { tmpValue, tmpValue->size() }; }); + return ({ QList* tmpValue = new QList(QLocale::matchingLocales(static_cast(language), static_cast(scri), static_cast(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(language), static_cast(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(language), static_cast(script), static_cast(country)); + return new QLocale(static_cast(language), static_cast(scri), static_cast(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(language)).toUtf8(); QtCore_PackedString { const_cast(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(script)).toUtf8(); QtCore_PackedString { const_cast(tfce283.prepend("WHITESPACE").constData()+10), tfce283.size()-10 }; }); + return ({ QByteArray t535509 = QLocale::scriptToString(static_cast(scri)).toUtf8(); QtCore_PackedString { const_cast(t535509.prepend("WHITESPACE").constData()+10), t535509.size()-10 }; }); } void QLocale_QLocale_SetDefault(void* locale) diff --git a/core/core.go b/core/core.go index a95e240c..23d720e2 100644 --- a/core/core.go +++ b/core/core.go @@ -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) { diff --git a/core/core.h b/core/core.h index b90d8e04..f4d531bf 100644 --- a/core/core.h +++ b/core/core.h @@ -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); diff --git a/internal/binding/parser/helper.go b/internal/binding/parser/helper.go index 260ca518..4969ab84 100644 --- a/internal/binding/parser/helper.go +++ b/internal/binding/parser/helper.go @@ -141,7 +141,8 @@ func CleanName(name, value string) string { "log", "runtime", "time", - "hex": + "hex", + "script": { return name[:len(name)-2] } diff --git a/internal/cmd/deploy/deploy.go b/internal/cmd/deploy/deploy.go index 99cdfa7f..ad7d4bdd 100644 --- a/internal/cmd/deploy/deploy.go +++ b/internal/cmd/deploy/deploy.go @@ -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) } diff --git a/qml/qml.cpp b/qml/qml.cpp index cbe1f632..0b920086 100644 --- a/qml/qml.cpp +++ b/qml/qml.cpp @@ -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(callbackQQmlExpression_MetaObject(const_cast(static_cast(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(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); + return new MyQQmlExpression(*static_cast(scri), static_cast(ctxt), static_cast(scope), static_cast(parent)); } } diff --git a/qml/qml.go b/qml/qml.go index ded4dc63..a49d0da1 100644 --- a/qml/qml.go +++ b/qml/qml.go @@ -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) }) } diff --git a/qml/qml.h b/qml/qml.h index 957809bf..388afb63 100644 --- a/qml/qml.h +++ b/qml/qml.h @@ -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);