diff options
| -rw-r--r-- | .cmake.conf | 1 | ||||
| -rw-r--r-- | src/plugins/ecmascriptdatamodel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/scxml/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/scxmlqml/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/statemachine/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/statemachineqml/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/compiled/tst_compiled.cpp | 4 |
7 files changed, 3 insertions, 8 deletions
diff --git a/.cmake.conf b/.cmake.conf index 734bc2d..64c9846 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -2,3 +2,4 @@ set(QT_REPO_MODULE_VERSION "6.7.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff --git a/src/plugins/ecmascriptdatamodel/CMakeLists.txt b/src/plugins/ecmascriptdatamodel/CMakeLists.txt index 8920cca..7babe22 100644 --- a/src/plugins/ecmascriptdatamodel/CMakeLists.txt +++ b/src/plugins/ecmascriptdatamodel/CMakeLists.txt @@ -14,8 +14,6 @@ qt_internal_add_plugin(QScxmlEcmaScriptDataModelPlugin qscxmlecmascriptdatamodelplugin.cpp qscxmlecmascriptdatamodelplugin_p.h qscxmlecmascriptdatamodel_p.h qscxmlecmascriptdatamodel.cpp qscxmlecmascriptplatformproperties.cpp qscxmlecmascriptplatformproperties_p.h - DEFINES - QT_NO_CONTEXTLESS_CONNECT LIBRARIES Qt::Core Qt::Scxml diff --git a/src/scxml/CMakeLists.txt b/src/scxml/CMakeLists.txt index 59efcb0..9bbf03f 100644 --- a/src/scxml/CMakeLists.txt +++ b/src/scxml/CMakeLists.txt @@ -28,7 +28,6 @@ qt_internal_add_module(Scxml DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - QT_NO_CONTEXTLESS_CONNECT LIBRARIES Qt::CorePrivate PUBLIC_LIBRARIES diff --git a/src/scxmlqml/CMakeLists.txt b/src/scxmlqml/CMakeLists.txt index fb63cf8..d252274 100644 --- a/src/scxmlqml/CMakeLists.txt +++ b/src/scxmlqml/CMakeLists.txt @@ -16,7 +16,6 @@ qt_internal_add_qml_module(ScxmlQml qscxmlqmlglobals_p.h DEFINES QT_BUILD_SCXMLQML_LIB - QT_NO_CONTEXTLESS_CONNECT DEPENDENCIES QtQml PUBLIC_LIBRARIES diff --git a/src/statemachine/CMakeLists.txt b/src/statemachine/CMakeLists.txt index 0bede3a..6e1a716 100644 --- a/src/statemachine/CMakeLists.txt +++ b/src/statemachine/CMakeLists.txt @@ -22,7 +22,6 @@ qt_internal_add_module(StateMachine DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - QT_NO_CONTEXTLESS_CONNECT LIBRARIES Qt::CorePrivate PUBLIC_LIBRARIES diff --git a/src/statemachineqml/CMakeLists.txt b/src/statemachineqml/CMakeLists.txt index cfa9de0..4da4590 100644 --- a/src/statemachineqml/CMakeLists.txt +++ b/src/statemachineqml/CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_add_qml_module(StateMachineQml statemachineforeign_p.h DEFINES QT_BUILD_STATEMACHINEQML_LIB - QT_NO_CONTEXTLESS_CONNECT DEPENDENCIES QtQml PUBLIC_LIBRARIES diff --git a/tests/auto/compiled/tst_compiled.cpp b/tests/auto/compiled/tst_compiled.cpp index cf48cda..83b4309 100644 --- a/tests/auto/compiled/tst_compiled.cpp +++ b/tests/auto/compiled/tst_compiled.cpp @@ -234,7 +234,7 @@ void tst_Compiled::topMachine() ++doneCounter; }); - QObject::connect(&stateMachine, &QScxmlStateMachine::invokedServicesChanged, + QObject::connect(&stateMachine, &QScxmlStateMachine::invokedServicesChanged, this, [&invokableServicesCount](const QList<QScxmlInvokableService *> &services) { invokableServicesCount = services.size(); }); @@ -259,7 +259,7 @@ void tst_Compiled::topMachineDynamic() ++doneCounter; }); - QObject::connect(stateMachine.data(), &QScxmlStateMachine::invokedServicesChanged, + QObject::connect(stateMachine.data(), &QScxmlStateMachine::invokedServicesChanged, this, [&invokableServicesCount](const QList<QScxmlInvokableService *> &services) { invokableServicesCount = services.size(); }); |