diff options
23 files changed, 40 insertions, 26 deletions
diff --git a/examples/scxml/calculator-qml/CMakeLists.txt b/examples/scxml/calculator-qml/CMakeLists.txt index 82aa74f..5b20f47 100644 --- a/examples/scxml/calculator-qml/CMakeLists.txt +++ b/examples/scxml/calculator-qml/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/calculator-qml") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(calculator-qml PUBLIC Qt::Scxml ) + # Resources: set(calculator-qml_resource_files "Button.qml" diff --git a/examples/scxml/calculator-widgets/CMakeLists.txt b/examples/scxml/calculator-widgets/CMakeLists.txt index f083979..6c3b421 100644 --- a/examples/scxml/calculator-widgets/CMakeLists.txt +++ b/examples/scxml/calculator-widgets/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/calculator-widgets") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(calculator-widgets PUBLIC Qt::Widgets ) + # Statecharts: qt6_add_statecharts(calculator-widgets ../calculator-common/statemachine.scxml diff --git a/examples/scxml/ftpclient/CMakeLists.txt b/examples/scxml/ftpclient/CMakeLists.txt index e97b669..15fa445 100644 --- a/examples/scxml/ftpclient/CMakeLists.txt +++ b/examples/scxml/ftpclient/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/ftpclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Scxml) @@ -26,6 +26,7 @@ target_link_libraries(ftpclient PUBLIC Qt::Scxml ) + # Statecharts: qt6_add_statecharts(ftpclient simpleftp.scxml diff --git a/examples/scxml/invoke-dynamic/CMakeLists.txt b/examples/scxml/invoke-dynamic/CMakeLists.txt index eb8ef6a..9bf520d 100644 --- a/examples/scxml/invoke-dynamic/CMakeLists.txt +++ b/examples/scxml/invoke-dynamic/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/invoke-dynamic") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(invoke-dynamic PUBLIC Qt::Scxml ) + # Resources: set_source_files_properties("../invoke-common/Button.qml" PROPERTIES QT_RESOURCE_ALIAS "Button.qml" @@ -54,7 +55,6 @@ qt6_add_resources(invoke-dynamic "invoke-dynamic" ${invoke-dynamic_resource_files} ) - install(TARGETS invoke-dynamic RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/scxml/invoke-static/CMakeLists.txt b/examples/scxml/invoke-static/CMakeLists.txt index f98abe3..e94a208 100644 --- a/examples/scxml/invoke-static/CMakeLists.txt +++ b/examples/scxml/invoke-static/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/invoke-static") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(invoke-static PUBLIC Qt::Scxml ) + # Resources: set_source_files_properties("../invoke-common/Button.qml" PROPERTIES QT_RESOURCE_ALIAS "Button.qml" diff --git a/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt b/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt index 3ef5bf8..cb99f9b 100644 --- a/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/mediaplayer-qml-cppdatamodel") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(mediaplayer-qml-cppdatamodel PUBLIC Qt::Scxml ) + # Resources: set_source_files_properties("../mediaplayer-common/Mediaplayer.qml" PROPERTIES QT_RESOURCE_ALIAS "Mediaplayer.qml" diff --git a/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt b/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt index 670558a..0fbf85e 100644 --- a/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt +++ b/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/mediaplayer-qml-dynamic") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(mediaplayer-qml-dynamic PUBLIC Qt::Scxml ) + # Resources: set_source_files_properties("../mediaplayer-common/Mediaplayer.qml" PROPERTIES QT_RESOURCE_ALIAS "Mediaplayer.qml" @@ -46,7 +47,6 @@ qt6_add_resources(mediaplayer-qml-dynamic "mediaplayer-qml-dynamic" ${mediaplayer-qml-dynamic_resource_files} ) - install(TARGETS mediaplayer-qml-dynamic RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/scxml/mediaplayer-qml-static/CMakeLists.txt b/examples/scxml/mediaplayer-qml-static/CMakeLists.txt index 6802e3b..164c910 100644 --- a/examples/scxml/mediaplayer-qml-static/CMakeLists.txt +++ b/examples/scxml/mediaplayer-qml-static/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/mediaplayer-qml-static") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(mediaplayer-qml-static PUBLIC Qt::Scxml ) + # Resources: set_source_files_properties("../mediaplayer-common/Mediaplayer.qml" PROPERTIES QT_RESOURCE_ALIAS "Mediaplayer.qml" diff --git a/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt b/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt index 42d5b89..93143f9 100644 --- a/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt +++ b/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/mediaplayer-widgets-dynamic") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(mediaplayer-widgets-dynamic PUBLIC Qt::Widgets ) + # Resources: set_source_files_properties("../mediaplayer-common/mediaplayer.scxml" PROPERTIES QT_RESOURCE_ALIAS "mediaplayer.scxml" @@ -42,7 +43,6 @@ qt6_add_resources(mediaplayer-widgets-dynamic "mediaplayer" ${mediaplayer_resource_files} ) - install(TARGETS mediaplayer-widgets-dynamic RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt b/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt index 70f5f71..276ff15 100644 --- a/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt +++ b/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/mediaplayer-widgets-static") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(mediaplayer-widgets-static PUBLIC Qt::Widgets ) + # Statecharts: qt6_add_statecharts(mediaplayer-widgets-static ../mediaplayer-common/mediaplayer.scxml diff --git a/examples/scxml/pinball/CMakeLists.txt b/examples/scxml/pinball/CMakeLists.txt index b52bab1..6e5daad 100644 --- a/examples/scxml/pinball/CMakeLists.txt +++ b/examples/scxml/pinball/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/pinball") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(pinball PUBLIC Qt::Widgets ) + # Statecharts: qt6_add_statecharts(pinball pinball.scxml diff --git a/examples/scxml/sudoku/CMakeLists.txt b/examples/scxml/sudoku/CMakeLists.txt index 6647645..9816b39 100644 --- a/examples/scxml/sudoku/CMakeLists.txt +++ b/examples/scxml/sudoku/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/sudoku") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(sudoku PUBLIC Qt::Widgets ) + # Resources: set(sudoku_resource_files "data/nearly-solved-sudoku.data" diff --git a/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt b/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt index c7bee0b..8fc3777 100644 --- a/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt +++ b/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/trafficlight-qml-dynamic") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(trafficlight-qml-dynamic PUBLIC Qt::Scxml ) + # Resources: set_source_files_properties("../trafficlight-common/Button.qml" PROPERTIES QT_RESOURCE_ALIAS "Button.qml" @@ -78,7 +79,6 @@ qt6_add_resources(trafficlight-qml-dynamic "trafficlight-qml-dynamic" ${trafficlight-qml-dynamic_resource_files} ) - install(TARGETS trafficlight-qml-dynamic RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/scxml/trafficlight-qml-simple/CMakeLists.txt b/examples/scxml/trafficlight-qml-simple/CMakeLists.txt index ad85c61..8d82550 100644 --- a/examples/scxml/trafficlight-qml-simple/CMakeLists.txt +++ b/examples/scxml/trafficlight-qml-simple/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/trafficlight-qml-simple") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(trafficlight-qml-simple PUBLIC Qt::Scxml ) + # Resources: set(trafficlight-qml-simple_resource_files "Light.qml" diff --git a/examples/scxml/trafficlight-qml-static/CMakeLists.txt b/examples/scxml/trafficlight-qml-static/CMakeLists.txt index 6927b9a..a056d7d 100644 --- a/examples/scxml/trafficlight-qml-static/CMakeLists.txt +++ b/examples/scxml/trafficlight-qml-static/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/trafficlight-qml-static") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(trafficlight-qml-static PUBLIC Qt::Scxml ) + # Resources: set_source_files_properties("../trafficlight-common/Button.qml" PROPERTIES QT_RESOURCE_ALIAS "Button.qml" diff --git a/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt b/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt index 5a3e268..c78fda8 100644 --- a/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt +++ b/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/trafficlight-widgets-dynamic") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(trafficlight-widgets-dynamic PUBLIC Qt::Widgets ) + # Resources: set_source_files_properties("../trafficlight-common/background.png" PROPERTIES QT_RESOURCE_ALIAS "background.png" @@ -66,7 +67,6 @@ qt6_add_resources(trafficlight-widgets-dynamic "trafficlight-widgets-dynamic" ${trafficlight-widgets-dynamic_resource_files} ) - install(TARGETS trafficlight-widgets-dynamic RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/scxml/trafficlight-widgets-static/CMakeLists.txt b/examples/scxml/trafficlight-widgets-static/CMakeLists.txt index f0268b7..9faa711 100644 --- a/examples/scxml/trafficlight-widgets-static/CMakeLists.txt +++ b/examples/scxml/trafficlight-widgets-static/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/scxml/trafficlight-widgets-static") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -27,6 +27,7 @@ target_link_libraries(trafficlight-widgets-static PUBLIC Qt::Widgets ) + # Resources: set_source_files_properties("../trafficlight-common/background.png" PROPERTIES QT_RESOURCE_ALIAS "background.png" diff --git a/src/imports/scxmlstatemachine/.prev_CMakeLists.txt b/src/imports/scxmlstatemachine/.prev_CMakeLists.txt index bf4a0ea..2d03021 100644 --- a/src/imports/scxmlstatemachine/.prev_CMakeLists.txt +++ b/src/imports/scxmlstatemachine/.prev_CMakeLists.txt @@ -8,6 +8,7 @@ add_qml_module(scxml URI "QtScxml" VERSION "5.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QScxmlStateMachinePlugin + SKIP_TYPE_REGISTRATION SOURCES eventconnection.cpp eventconnection_p.h invokedservices.cpp invokedservices_p.h diff --git a/src/imports/scxmlstatemachine/CMakeLists.txt b/src/imports/scxmlstatemachine/CMakeLists.txt index b94c0e5..8d93d00 100644 --- a/src/imports/scxmlstatemachine/CMakeLists.txt +++ b/src/imports/scxmlstatemachine/CMakeLists.txt @@ -8,6 +8,7 @@ add_qml_module(declarative_scxml # special case URI "QtScxml" VERSION "5.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QScxmlStateMachinePlugin + SKIP_TYPE_REGISTRATION SOURCES eventconnection.cpp eventconnection_p.h invokedservices.cpp invokedservices_p.h diff --git a/src/scxml/.prev_CMakeLists.txt b/src/scxml/.prev_CMakeLists.txt index 1d078b2..3496182 100644 --- a/src/scxml/.prev_CMakeLists.txt +++ b/src/scxml/.prev_CMakeLists.txt @@ -49,7 +49,7 @@ extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel Qt::Qml ) -#### Keys ignored in scope 3:.:.:scxml.pro:NOT force_independent AND (NOT debug_and_release OR NOT build_all OR CONFIG(release,debug OR release)): +#### Keys ignored in scope 3:.:.:scxml.pro:NOT force_independent AND ( NOT debug_and_release OR NOT build_all OR CONFIG(release,debug OR release) ): # QMAKE_EXTRA_COMPILERS = "prf2build" # prf2build.CONFIG = "no_link" "no_clean" "target_predeps" # prf2build.commands = "$$QMAKE_COPY" "${QMAKE_FILE_IN}" "${QMAKE_FILE_OUT}" diff --git a/src/scxml/CMakeLists.txt b/src/scxml/CMakeLists.txt index aa04656..d5ddc59 100644 --- a/src/scxml/CMakeLists.txt +++ b/src/scxml/CMakeLists.txt @@ -49,7 +49,7 @@ extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel Qt::Qml ) -#### Keys ignored in scope 3:.:.:scxml.pro:NOT force_independent AND (NOT debug_and_release OR NOT build_all OR CONFIG(release,debug OR release)): +#### Keys ignored in scope 3:.:.:scxml.pro:NOT force_independent AND ( NOT debug_and_release OR NOT build_all OR CONFIG(release,debug OR release) ): # QMAKE_EXTRA_COMPILERS = "prf2build" # prf2build.CONFIG = "no_link" "no_clean" "target_predeps" # prf2build.commands = "$$QMAKE_COPY" "${QMAKE_FILE_IN}" "${QMAKE_FILE_OUT}" diff --git a/tests/auto/scion/.prev_CMakeLists.txt b/tests/auto/scion/.prev_CMakeLists.txt index 51bba64..e4a0acf 100644 --- a/tests/auto/scion/.prev_CMakeLists.txt +++ b/tests/auto/scion/.prev_CMakeLists.txt @@ -42,7 +42,7 @@ add_qt_test(tst_scion # sn = "__relative_path___absolute_path___dirname_1_____OUT_PWD____SCXMLS_DIR_" #### Keys ignored in scope 3:.:.:scion.pro:defineReplace(nameTheClass): -# cn = "__basename_1_" +# cn = "1" extend_target(tst_scion CONDITION MSVC AND WIN32 COMPILE_OPTIONS diff --git a/tests/auto/scion/CMakeLists.txt b/tests/auto/scion/CMakeLists.txt index 70f0c08..ddf6629 100644 --- a/tests/auto/scion/CMakeLists.txt +++ b/tests/auto/scion/CMakeLists.txt @@ -42,7 +42,7 @@ add_qt_test(tst_scion # sn = "__relative_path___absolute_path___dirname_1_____OUT_PWD____SCXMLS_DIR_" #### Keys ignored in scope 3:.:.:scion.pro:defineReplace(nameTheClass): -# cn = "__basename_1_" +# cn = "1" extend_target(tst_scion CONDITION MSVC AND WIN32 COMPILE_OPTIONS |