From 804fb1f97a713edc96435433d15b09a3cb670416 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 14 Nov 2019 17:34:16 +0100 Subject: Regenerate projects Change-Id: I8f779c41390e242634e32ff94d13041a8559f272 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/imports/scxmlstatemachine/.prev_CMakeLists.txt | 3 +-- src/imports/scxmlstatemachine/CMakeLists.txt | 3 +-- src/scxml/.prev_CMakeLists.txt | 7 +++---- src/scxml/CMakeLists.txt | 7 +++---- tests/auto/compiled/CMakeLists.txt | 4 ++-- tests/auto/dynamicmetaobject/CMakeLists.txt | 4 ++-- tests/auto/parser/CMakeLists.txt | 4 ++-- tests/auto/scion/.prev_CMakeLists.txt | 4 ++-- tests/auto/scion/CMakeLists.txt | 4 ++-- tests/auto/statemachine/CMakeLists.txt | 4 ++-- tests/auto/statemachineinfo/CMakeLists.txt | 4 ++-- tools/qscxmlc/.prev_CMakeLists.txt | 5 ++--- tools/qscxmlc/CMakeLists.txt | 5 ++--- 13 files changed, 26 insertions(+), 32 deletions(-) diff --git a/src/imports/scxmlstatemachine/.prev_CMakeLists.txt b/src/imports/scxmlstatemachine/.prev_CMakeLists.txt index 2d03021..40bb2aa 100644 --- a/src/imports/scxmlstatemachine/.prev_CMakeLists.txt +++ b/src/imports/scxmlstatemachine/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## scxml Plugin: ##################################################################### -add_qml_module(scxml +qt_add_qml_module(scxml URI "QtScxml" VERSION "5.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QScxmlStateMachinePlugin @@ -28,4 +28,3 @@ add_qml_module(scxml # IMPORT_VERSION = "5.$$QT_MINOR_VERSION" # OTHER_FILES = "plugins.qmltypes" "qmldir" # TARGETPATH = "QtScxml" -# _LOADED = "qml_plugin" diff --git a/src/imports/scxmlstatemachine/CMakeLists.txt b/src/imports/scxmlstatemachine/CMakeLists.txt index 8d93d00..f0218cd 100644 --- a/src/imports/scxmlstatemachine/CMakeLists.txt +++ b/src/imports/scxmlstatemachine/CMakeLists.txt @@ -4,7 +4,7 @@ ## scxml Plugin: ##################################################################### -add_qml_module(declarative_scxml # special case +qt_add_qml_module(declarative_scxml # special case URI "QtScxml" VERSION "5.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QScxmlStateMachinePlugin @@ -28,4 +28,3 @@ add_qml_module(declarative_scxml # special case # IMPORT_VERSION = "5.$$QT_MINOR_VERSION" # OTHER_FILES = "plugins.qmltypes" "qmldir" # TARGETPATH = "QtScxml" -# _LOADED = "qml_plugin" diff --git a/src/scxml/.prev_CMakeLists.txt b/src/scxml/.prev_CMakeLists.txt index 3496182..7b9c22f 100644 --- a/src/scxml/.prev_CMakeLists.txt +++ b/src/scxml/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Scxml Module: ##################################################################### -add_qt_module(Scxml +qt_add_module(Scxml QMAKE_MODULE_CONFIG c++11 qscxmlc SOURCES qscxmlcompiler.cpp qscxmlcompiler.h qscxmlcompiler_p.h @@ -32,14 +32,13 @@ add_qt_module(Scxml # FEATURES = "../../mkspecs/features/qscxmlc.prf" # INSTALLS = "features" # MODULE_CONFIG = "c++11" "qscxmlc" -# _LOADED = "qt_module" # features.files = "$$FEATURES" # features.path = "$$[QT_HOST_DATA]/mkspecs/features/" ## Scopes: ##################################################################### -extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel +qt_extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel SOURCES qscxmlecmascriptdatamodel.cpp qscxmlecmascriptdatamodel.h qscxmlecmascriptplatformproperties.cpp qscxmlecmascriptplatformproperties_p.h @@ -56,7 +55,7 @@ extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel # prf2build.input = "FEATURES" # prf2build.name = "COPY" "${QMAKE_FILE_IN}" # prf2build.output = "$$[QT_INSTALL_DATA/get]/mkspecs/features/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}" -add_qt_docs(Scxml +qt_add_docs(Scxml doc/qtscxml.qdocconf ) diff --git a/src/scxml/CMakeLists.txt b/src/scxml/CMakeLists.txt index d5ddc59..9b686e6 100644 --- a/src/scxml/CMakeLists.txt +++ b/src/scxml/CMakeLists.txt @@ -4,7 +4,7 @@ ## Scxml Module: ##################################################################### -add_qt_module(Scxml +qt_add_module(Scxml QMAKE_MODULE_CONFIG c++11 qscxmlc SOURCES qscxmlcompiler.cpp qscxmlcompiler.h qscxmlcompiler_p.h @@ -32,14 +32,13 @@ add_qt_module(Scxml # FEATURES = "../../mkspecs/features/qscxmlc.prf" # INSTALLS = "features" # MODULE_CONFIG = "c++11" "qscxmlc" -# _LOADED = "qt_module" # features.files = "$$FEATURES" # features.path = "$$[QT_HOST_DATA]/mkspecs/features/" ## Scopes: ##################################################################### -extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel +qt_extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel SOURCES qscxmlecmascriptdatamodel.cpp qscxmlecmascriptdatamodel.h qscxmlecmascriptplatformproperties.cpp qscxmlecmascriptplatformproperties_p.h @@ -56,7 +55,7 @@ extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel # prf2build.input = "FEATURES" # prf2build.name = "COPY" "${QMAKE_FILE_IN}" # prf2build.output = "$$[QT_INSTALL_DATA/get]/mkspecs/features/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}" -add_qt_docs(Scxml +qt_add_docs(Scxml doc/qtscxml.qdocconf ) diff --git a/tests/auto/compiled/CMakeLists.txt b/tests/auto/compiled/CMakeLists.txt index 6b61bab..aa2c70c 100644 --- a/tests/auto/compiled/CMakeLists.txt +++ b/tests/auto/compiled/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_compiled Test: ##################################################################### -add_qt_test(tst_compiled +qt_add_test(tst_compiled SOURCES tst_compiled.cpp PUBLIC_LIBRARIES @@ -20,7 +20,7 @@ set(tst_compiled_resource_files "topmachine.scxml" ) -add_qt_resource(tst_compiled "tst_compiled" +qt_add_resource(tst_compiled "tst_compiled" PREFIX "/" FILES diff --git a/tests/auto/dynamicmetaobject/CMakeLists.txt b/tests/auto/dynamicmetaobject/CMakeLists.txt index 698bb5c..2367bdf 100644 --- a/tests/auto/dynamicmetaobject/CMakeLists.txt +++ b/tests/auto/dynamicmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_dynamicmetaobject Test: ##################################################################### -add_qt_test(tst_dynamicmetaobject +qt_add_test(tst_dynamicmetaobject SOURCES tst_dynamicmetaobject.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ set(tst_dynamicmetaobject_resource_files "test1.scxml" ) -add_qt_resource(tst_dynamicmetaobject "tst_dynamicmetaobject" +qt_add_resource(tst_dynamicmetaobject "tst_dynamicmetaobject" PREFIX "/tst_dynamicmetaobject" FILES diff --git a/tests/auto/parser/CMakeLists.txt b/tests/auto/parser/CMakeLists.txt index fea776f..cc194d7 100644 --- a/tests/auto/parser/CMakeLists.txt +++ b/tests/auto/parser/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_parser Test: ##################################################################### -add_qt_test(tst_parser +qt_add_test(tst_parser SOURCES tst_parser.cpp PUBLIC_LIBRARIES @@ -97,7 +97,7 @@ set(tst_parser_resource_files "data/test1.scxml.errors" ) -add_qt_resource(tst_parser "tst_parser" +qt_add_resource(tst_parser "tst_parser" PREFIX "/tst_parser" FILES diff --git a/tests/auto/scion/.prev_CMakeLists.txt b/tests/auto/scion/.prev_CMakeLists.txt index e4a0acf..9e17424 100644 --- a/tests/auto/scion/.prev_CMakeLists.txt +++ b/tests/auto/scion/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_scion Test: ##################################################################### -add_qt_test(tst_scion +qt_add_test(tst_scion SOURCES tst_scion.cpp DEFINES @@ -44,7 +44,7 @@ add_qt_test(tst_scion #### Keys ignored in scope 3:.:.:scion.pro:defineReplace(nameTheClass): # cn = "1" -extend_target(tst_scion CONDITION MSVC AND WIN32 +qt_extend_target(tst_scion CONDITION MSVC AND WIN32 COMPILE_OPTIONS /bigobj ) diff --git a/tests/auto/scion/CMakeLists.txt b/tests/auto/scion/CMakeLists.txt index ddf6629..3b05527 100644 --- a/tests/auto/scion/CMakeLists.txt +++ b/tests/auto/scion/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_scion Test: ##################################################################### -add_qt_test(tst_scion +qt_add_test(tst_scion SOURCES tst_scion.cpp DEFINES @@ -44,7 +44,7 @@ add_qt_test(tst_scion #### Keys ignored in scope 3:.:.:scion.pro:defineReplace(nameTheClass): # cn = "1" -extend_target(tst_scion CONDITION MSVC AND WIN32 +qt_extend_target(tst_scion CONDITION MSVC AND WIN32 COMPILE_OPTIONS /bigobj ) diff --git a/tests/auto/statemachine/CMakeLists.txt b/tests/auto/statemachine/CMakeLists.txt index f0e90e3..458ada3 100644 --- a/tests/auto/statemachine/CMakeLists.txt +++ b/tests/auto/statemachine/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_statemachine Test: ##################################################################### -add_qt_test(tst_statemachine +qt_add_test(tst_statemachine SOURCES tst_statemachine.cpp LIBRARIES @@ -28,7 +28,7 @@ set(tst_statemachine_resource_files "statenamesnested.scxml" ) -add_qt_resource(tst_statemachine "tst_statemachine" +qt_add_resource(tst_statemachine "tst_statemachine" PREFIX "/tst_statemachine" FILES diff --git a/tests/auto/statemachineinfo/CMakeLists.txt b/tests/auto/statemachineinfo/CMakeLists.txt index 06c0cd2..ea1bae0 100644 --- a/tests/auto/statemachineinfo/CMakeLists.txt +++ b/tests/auto/statemachineinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_statemachineinfo Test: ##################################################################### -add_qt_test(tst_statemachineinfo +qt_add_test(tst_statemachineinfo SOURCES tst_statemachineinfo.cpp LIBRARIES @@ -20,7 +20,7 @@ set(tst_statemachineinfo_resource_files "statemachine.scxml" ) -add_qt_resource(tst_statemachineinfo "tst_statemachineinfo" +qt_add_resource(tst_statemachineinfo "tst_statemachineinfo" PREFIX "/tst_statemachineinfo" FILES diff --git a/tools/qscxmlc/.prev_CMakeLists.txt b/tools/qscxmlc/.prev_CMakeLists.txt index 71e210e..a1c65fc 100644 --- a/tools/qscxmlc/.prev_CMakeLists.txt +++ b/tools/qscxmlc/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qscxmlc Tool: ##################################################################### -add_qt_tool(qscxmlc +qt_add_tool(qscxmlc SOURCES ../../src/scxml/qscxmlcompiler.cpp ../../src/scxml/qscxmlcompiler.h ../../src/scxml/qscxmlcompiler_p.h ../../src/scxml/qscxmlerror.cpp ../../src/scxml/qscxmlerror.h @@ -36,7 +36,7 @@ set(templates_resource_files "decl.t" ) -add_qt_resource(qscxmlc "templates" +qt_add_resource(qscxmlc "templates" PREFIX "/" FILES @@ -45,5 +45,4 @@ add_qt_resource(qscxmlc "templates" #### Keys ignored in scope 1:.:.:qscxmlc.pro:: -# _LOADED = "qt_tool" "resources" # _OPTION = "host_build" diff --git a/tools/qscxmlc/CMakeLists.txt b/tools/qscxmlc/CMakeLists.txt index ba91e9c..5daaf26 100644 --- a/tools/qscxmlc/CMakeLists.txt +++ b/tools/qscxmlc/CMakeLists.txt @@ -4,7 +4,7 @@ ## qscxmlc Tool: ##################################################################### -add_qt_tool(qscxmlc +qt_add_tool(qscxmlc TOOLS_TARGET Scxml # special case SOURCES ../../src/scxml/qscxmlcompiler.cpp ../../src/scxml/qscxmlcompiler.h ../../src/scxml/qscxmlcompiler_p.h @@ -44,7 +44,7 @@ set(templates_resource_files "decl.t" ) -add_qt_resource(qscxmlc "templates" +qt_add_resource(qscxmlc "templates" PREFIX "/" FILES @@ -54,5 +54,4 @@ add_qt_resource(qscxmlc "templates" #### Keys ignored in scope 1:.:.:qscxmlc.pro:: -# _LOADED = "qt_tool" "resources" # _OPTION = "host_build" -- cgit v1.2.3