diff options
72 files changed, 163 insertions, 132 deletions
diff --git a/examples/qmltest/qmltest/.prev_CMakeLists.txt b/examples/qmltest/qmltest/.prev_CMakeLists.txt index a24e6ef85e..b3d5cc69ae 100644 --- a/examples/qmltest/qmltest/.prev_CMakeLists.txt +++ b/examples/qmltest/qmltest/.prev_CMakeLists.txt @@ -21,6 +21,7 @@ target_link_libraries(tst_qmltestexample PUBLIC Qt::Core Qt::Gui ) + if(QT_BUILDING_QT) target_link_libraries(tst_qmltestexample PUBLIC Qt::Qml diff --git a/examples/qmltest/qmltest/CMakeLists.txt b/examples/qmltest/qmltest/CMakeLists.txt index 2c99b73998..8a890cc246 100644 --- a/examples/qmltest/qmltest/CMakeLists.txt +++ b/examples/qmltest/qmltest/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(tst_qmltestexample PUBLIC ) # special case begin -# This ling get added, but does not make sense +# This line get added, but does not make sense #if(QT_BUILDING_QT) # target_link_libraries(tst_qmltestexample PUBLIC # Qt::Qml diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt index d9bb57c950..7cd8d75653 100644 --- a/src/imports/folderlistmodel/CMakeLists.txt +++ b/src/imports/folderlistmodel/CMakeLists.txt @@ -26,4 +26,3 @@ add_qml_module(qmlfolderlistmodelplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # TARGETPATH = "Qt/labs/folderlistmodel" -# _LOADED = "qml_plugin" diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt index a296eed5f2..6b54d02d72 100644 --- a/src/imports/labsanimation/CMakeLists.txt +++ b/src/imports/labsanimation/CMakeLists.txt @@ -24,4 +24,3 @@ add_qml_module(labsanimationplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "1.0" # TARGETPATH = "Qt/labs/animation" -# _LOADED = "qml_plugin" diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt index 268120ffc1..ce3e290a83 100644 --- a/src/imports/labsmodels/CMakeLists.txt +++ b/src/imports/labsmodels/CMakeLists.txt @@ -23,4 +23,3 @@ add_qml_module(labsmodelsplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "1.0" # TARGETPATH = "Qt/labs/qmlmodels" -# _LOADED = "qml_plugin" diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt index dbfefb239d..666aae5dc0 100644 --- a/src/imports/layouts/CMakeLists.txt +++ b/src/imports/layouts/CMakeLists.txt @@ -33,4 +33,3 @@ add_qml_module(qquicklayoutsplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" # TARGETPATH = "QtQuick/Layouts" -# _LOADED = "qml_plugin" diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt index 665b03e02c..c785a4bd2e 100644 --- a/src/imports/localstorage/CMakeLists.txt +++ b/src/imports/localstorage/CMakeLists.txt @@ -26,4 +26,3 @@ add_qml_module(qmllocalstorageplugin # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "localstorage.json" # TARGETPATH = "QtQuick/LocalStorage" -# _LOADED = "qml_plugin" diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index a7affed6e4..1bfb7a35d3 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -25,4 +25,3 @@ add_qml_module(modelsplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # TARGETPATH = "QtQml/Models.2" -# _LOADED = "qml_plugin" diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index 04fd522837..f2f0ae8a84 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -28,4 +28,3 @@ add_qml_module(particlesplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # TARGETPATH = "QtQuick/Particles.2" -# _LOADED = "qml_plugin" diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt index e8261aa5c7..281e83242f 100644 --- a/src/imports/qtqml/.prev_CMakeLists.txt +++ b/src/imports/qtqml/.prev_CMakeLists.txt @@ -27,4 +27,3 @@ add_qml_module(qmlplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # TARGETPATH = "QtQml" -# _LOADED = "qml_plugin" diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt index 185116e6ce..a8ac5d8b8a 100644 --- a/src/imports/qtqml/CMakeLists.txt +++ b/src/imports/qtqml/CMakeLists.txt @@ -28,4 +28,3 @@ add_qml_module(qmlplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # TARGETPATH = "QtQml" -# _LOADED = "qml_plugin" diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index f40864b8e0..a8dabb3371 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -31,7 +31,6 @@ add_qml_module(qtquick2plugin # CXX_MODULE = "qml" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # TARGETPATH = "QtQuick.2" -# _LOADED = "qml_plugin" ## Scopes: ##################################################################### diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt index 57ab9efa89..d3827443e0 100644 --- a/src/imports/settings/CMakeLists.txt +++ b/src/imports/settings/CMakeLists.txt @@ -21,4 +21,3 @@ add_qml_module(qmlsettingsplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "1.1" # TARGETPATH = "Qt/labs/settings" -# _LOADED = "qml_plugin" diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt index c91c246ace..525b25e659 100644 --- a/src/imports/shapes/CMakeLists.txt +++ b/src/imports/shapes/CMakeLists.txt @@ -27,4 +27,3 @@ add_qml_module(qmlshapesplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" # TARGETPATH = "QtQuick/Shapes" -# _LOADED = "qml_plugin" diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt index 6dbf8f8ab7..dcf1b3f8e2 100644 --- a/src/imports/sharedimage/CMakeLists.txt +++ b/src/imports/sharedimage/CMakeLists.txt @@ -28,4 +28,3 @@ add_qml_module(sharedimageplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "1.0" # TARGETPATH = "Qt/labs/sharedimage" -# _LOADED = "qml_plugin" diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt index 187ec496f7..a32278e755 100644 --- a/src/imports/statemachine/CMakeLists.txt +++ b/src/imports/statemachine/CMakeLists.txt @@ -30,4 +30,3 @@ add_qml_module(qtqmlstatemachine # CXX_MODULE = "qml" # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" # TARGETPATH = "QtQml/StateMachine" -# _LOADED = "qml_plugin" diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt index 17cfcc34ec..dad2b51b83 100644 --- a/src/imports/testlib/.prev_CMakeLists.txt +++ b/src/imports/testlib/.prev_CMakeLists.txt @@ -31,7 +31,6 @@ add_qml_module(qmltestplugin # OTHER_FILES = "testlib.json" # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" # TARGETPATH = "QtTest" -# _LOADED = "qml_plugin" set(qml_files "TestCase.qml" diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index b72e907fcb..bb33464ba7 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -31,7 +31,6 @@ add_qml_module(qmltestplugin # OTHER_FILES = "testlib.json" # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" # TARGETPATH = "QtTest" -# _LOADED = "qml_plugin" set(qml_files "TestCase.qml" diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt index 41a88305c7..b43ca7656b 100644 --- a/src/imports/wavefrontmesh/CMakeLists.txt +++ b/src/imports/wavefrontmesh/CMakeLists.txt @@ -26,4 +26,3 @@ add_qml_module(qmlwavefrontmeshplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" # TARGETPATH = "Qt/labs/wavefrontmesh" -# _LOADED = "qml_plugin" diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt index 9301f86038..0f76e020e9 100644 --- a/src/imports/window/CMakeLists.txt +++ b/src/imports/window/CMakeLists.txt @@ -27,4 +27,3 @@ add_qml_module(windowplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # TARGETPATH = "QtQuick/Window.2" -# _LOADED = "qml_plugin" diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index ae0da6de0c..86487e5730 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -25,4 +25,3 @@ add_qml_module(workerscriptplugin # CXX_MODULE = "qml" # IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # TARGETPATH = "QtQml/WorkerScript.2" -# _LOADED = "qml_plugin" diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index dac7705233..f7aca8859f 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -99,7 +99,6 @@ add_qt_resource(QuickParticles "particles1" #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>: # MODULE = "quickparticles" -# _LOADED = "qt_module" ## Scopes: ##################################################################### diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt index 6e19d288a8..7a557b3b3e 100644 --- a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt +++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt @@ -16,6 +16,3 @@ add_qt_module(PacketProtocol PUBLIC_LIBRARIES Qt::Core ) - -#### Keys ignored in scope 1:.:.:packetprotocol.pro:<TRUE>: -# _LOADED = "qt_module" diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt index 01c73e4919..f5c3064c2c 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt @@ -28,4 +28,3 @@ add_qt_plugin(qmldbg_debugger #### Keys ignored in scope 1:.:.:qmldbg_debugger.pro:<TRUE>: # OTHER_FILES = "$$PWD/qqmldebuggerservice.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt index cca4d0f793..8e6d45ab40 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt @@ -30,4 +30,3 @@ add_qt_plugin(qmldbg_inspector #### Keys ignored in scope 1:.:.:qmldbg_inspector.pro:<TRUE>: # OTHER_FILES = "qqmlinspectorservice.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt index 377616f059..e12b45c8d3 100644 --- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt @@ -18,4 +18,3 @@ add_qt_plugin(qmldbg_local #### Keys ignored in scope 1:.:.:qmldbg_local.pro:<TRUE>: # OTHER_FILES = "$$PWD/qlocalclientconnection.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt index 7e2d5df4cf..5b203a8955 100644 --- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt @@ -21,4 +21,3 @@ add_qt_plugin(qmldbg_messages #### Keys ignored in scope 1:.:.:qmldbg_messages.pro:<TRUE>: # OTHER_FILES = "$$PWD/qdebugmessageservice.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt index 4caa79ba22..95bdce601f 100644 --- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt @@ -21,4 +21,3 @@ add_qt_plugin(qmldbg_native #### Keys ignored in scope 1:.:.:qmldbg_native.pro:<TRUE>: # OTHER_FILES = "$$PWD/qqmlnativedebugconnector.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt index a106e2f146..d93df65eb0 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt @@ -21,4 +21,3 @@ add_qt_plugin(qmldbg_nativedebugger #### Keys ignored in scope 1:.:.:qmldbg_nativedebugger.pro:<TRUE>: # OTHER_FILES = "$$PWD/qqmlnativedebugservice.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt index f920c602fb..79636c8aea 100644 --- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt @@ -32,4 +32,3 @@ add_qt_plugin(qmldbg_preview #### Keys ignored in scope 1:.:.:qmldbg_preview.pro:<TRUE>: # OTHER_FILES = "$$PWD/qqmlpreviewservice.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt index 74999f219c..06eb52ecfc 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt @@ -25,4 +25,3 @@ add_qt_plugin(qmldbg_profiler #### Keys ignored in scope 1:.:.:qmldbg_profiler.pro:<TRUE>: # OTHER_FILES = "$$PWD/qqmlprofilerservice.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt index ad88af46bb..5afeaa1775 100644 --- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt @@ -25,4 +25,3 @@ add_qt_plugin(qmldbg_quickprofiler #### Keys ignored in scope 1:.:.:qmldbg_quickprofiler.pro:<TRUE>: # OTHER_FILES = "qquickprofileradapter.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt index 30045f9fa3..6fb864bc24 100644 --- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt @@ -20,4 +20,3 @@ add_qt_plugin(qmldbg_server #### Keys ignored in scope 1:.:.:qmldbg_server.pro:<TRUE>: # OTHER_FILES = "qqmldebugserver.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt index 04cfcddc8e..cfc0503ea3 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt @@ -19,4 +19,3 @@ add_qt_plugin(qmldbg_tcp #### Keys ignored in scope 1:.:.:qmldbg_tcp.pro:<TRUE>: # OTHER_FILES = "$$PWD/qtcpserverconnection.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt index f1d5e45644..4127556dad 100644 --- a/src/plugins/scenegraph/openvg/CMakeLists.txt +++ b/src/plugins/scenegraph/openvg/CMakeLists.txt @@ -43,7 +43,6 @@ add_qt_plugin(qsgopenvgbackend # OTHER_FILES = "$$PWD/openvg.json" # QMAKE_TARGET_DESCRIPTION = "Quick OpenVG Renderer for Qt." # QMAKE_TARGET_PRODUCT = "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index ee1f3cb31f..8f5ada93c6 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -335,9 +335,6 @@ qt_process_qlalr( "" ) -#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: -# _LOADED = "qt_module" - ## Scopes: ##################################################################### @@ -382,7 +379,7 @@ extend_target(Qml CONDITION EXISTS "qqml_enable_gcov" -ftest-coverage ) -extend_target(Qml CONDITION release AND MSVC AND QT_CL_MAJOR_VERSION___equals___19 AND QT_CL_MINOR_VERSION___equals___00 AND greaterThan(QT_CL_PATCH_VERSION,24212) +extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212) COMPILE_OPTIONS -d2SSAOptimizer- ) @@ -390,7 +387,7 @@ extend_target(Qml CONDITION release AND MSVC AND QT_CL_MAJOR_VERSION___equals___ #### Keys ignored in scope 10:.:.:qml.pro:ICC: # WERROR = "-ww2415" -#### Keys ignored in scope 11:.:.:qml.pro:greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) OR greaterThan(QT_APPLE_CLANG_MAJOR_VERSION,5) OR ( QT_APPLE_CLANG_MAJOR_VERSION___equals___5 AND greaterThan(QT_APPLE_CLANG_MINOR_VERSION,0) ): +#### Keys ignored in scope 11:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ): # WERROR = "-Wno-error=unused-const-variable" extend_target(Qml CONDITION QT_FEATURE_qml_jit diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 2be9e58bc9..df2cdf417d 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -335,12 +335,7 @@ add_qt_module(Qml # parser/qqmljs.g # "" #) -# special case end - -#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: -# _LOADED = "qt_module" -# special case begin qt_declarative_write_tag_header(Qml) set(_qt_qlalr_flags "--no-debug" "--qt") qt_process_qlalr(Qml "${CMAKE_CURRENT_SOURCE_DIR}/parser/qqmljs.g" "${_qt_qlalr_flags}") @@ -391,7 +386,7 @@ extend_target(Qml CONDITION EXISTS "qqml_enable_gcov" -ftest-coverage ) -extend_target(Qml CONDITION release AND MSVC AND QT_CL_MAJOR_VERSION___equals___19 AND QT_CL_MINOR_VERSION___equals___00 AND greaterThan(QT_CL_PATCH_VERSION,24212) +extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212) COMPILE_OPTIONS -d2SSAOptimizer- ) @@ -399,7 +394,7 @@ extend_target(Qml CONDITION release AND MSVC AND QT_CL_MAJOR_VERSION___equals___ #### Keys ignored in scope 10:.:.:qml.pro:ICC: # WERROR = "-ww2415" -#### Keys ignored in scope 11:.:.:qml.pro:greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) OR greaterThan(QT_APPLE_CLANG_MAJOR_VERSION,5) OR ( QT_APPLE_CLANG_MAJOR_VERSION___equals___5 AND greaterThan(QT_APPLE_CLANG_MINOR_VERSION,0) ): +#### Keys ignored in scope 11:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ): # WERROR = "-Wno-error=unused-const-variable" extend_target(Qml CONDITION QT_FEATURE_qml_jit diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt index 1972c6b796..d39bf7d69b 100644 --- a/src/qmldebug/CMakeLists.txt +++ b/src/qmldebug/CMakeLists.txt @@ -38,6 +38,3 @@ add_qt_module(QmlDebug Qt::Network Qt::PacketProtocol ) - -#### Keys ignored in scope 1:.:.:qmldebug.pro:<TRUE>: -# _LOADED = "qt_module" diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt index 7bd3f0de9e..32e05de6b2 100644 --- a/src/qmldevtools/.prev_CMakeLists.txt +++ b/src/qmldevtools/.prev_CMakeLists.txt @@ -59,7 +59,6 @@ qt_process_qlalr( #### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>: # MODULE_INCNAME = "QtQml" -# _LOADED = "qt_module" # _OPTION = "host_build" ## Scopes: @@ -68,7 +67,7 @@ qt_process_qlalr( #### Keys ignored in scope 2:.:.:qmldevtools.pro:ICC: # WERROR = "-ww2415" -#### Keys ignored in scope 3:.:.:qmldevtools.pro:CLANG AND ( greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) ): +#### Keys ignored in scope 3:.:.:qmldevtools.pro:CLANG AND ( (QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) ): # WERROR = "-Wno-error=unused-const-variable" #### Keys ignored in scope 5:.:../qml/common:../qml/common/common.pri:NOT build_pass: diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt index cff3b652ac..f819a81b0f 100644 --- a/src/qmldevtools/CMakeLists.txt +++ b/src/qmldevtools/CMakeLists.txt @@ -87,7 +87,6 @@ add_dependencies(QmlDevTools Qml) #### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>: # MODULE_INCNAME = "QtQml" -# _LOADED = "qt_module" # _OPTION = "host_build" ## Scopes: @@ -96,7 +95,7 @@ add_dependencies(QmlDevTools Qml) #### Keys ignored in scope 2:.:.:qmldevtools.pro:ICC: # WERROR = "-ww2415" -#### Keys ignored in scope 3:.:.:qmldevtools.pro:CLANG AND ( greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) ): +#### Keys ignored in scope 3:.:.:qmldevtools.pro:CLANG AND ( (QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) ): # WERROR = "-Wno-error=unused-const-variable" #### Keys ignored in scope 5:.:../qml/common:../qml/common/common.pri:NOT build_pass: diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index 4b6ea4e392..360b2dfa96 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -21,9 +21,6 @@ add_qt_module(QmlModels Qt::Qml ) -#### Keys ignored in scope 1:.:.:qmlmodels.pro:<TRUE>: -# _LOADED = "qt_module" - ## Scopes: ##################################################################### diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt index 9ff4ade822..e4a5ed71ef 100644 --- a/src/qmltest/.prev_CMakeLists.txt +++ b/src/qmltest/.prev_CMakeLists.txt @@ -31,7 +31,6 @@ add_qt_module(QuickTest #### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>: # MODULE_CONFIG = "$${QT.testlib.CONFIG}" -# _LOADED = "qt_module" ## Scopes: ##################################################################### diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index ead409288f..d576d86036 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -32,7 +32,6 @@ add_qt_module(QuickTest #### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>: # MODULE_CONFIG = "$${QT.testlib.CONFIG}" -# _LOADED = "qt_module" ## Scopes: ##################################################################### diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index c78d4065f3..21eba19ebc 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -45,9 +45,6 @@ add_qt_module(QmlWorkerScript Qt::Qml ) -#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: -# _LOADED = "qt_module" - ## Scopes: ##################################################################### diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 893da25b6b..08877cb2de 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -45,9 +45,6 @@ add_qt_module(QmlWorkerScript Qt::Qml ) -#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: -# _LOADED = "qt_module" - ## Scopes: ##################################################################### diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index eea86746a7..7b6e7076a7 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -348,9 +348,6 @@ if(ANDROID) ) endif() -#### Keys ignored in scope 1:.:.:quick.pro:<TRUE>: -# _LOADED = "qt_module" - ## Scopes: ##################################################################### diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt index 661ba534fa..04dda812d0 100644 --- a/src/quickshapes/CMakeLists.txt +++ b/src/quickshapes/CMakeLists.txt @@ -56,9 +56,6 @@ add_qt_resource(QuickShapes "qtquickshapes" ) -#### Keys ignored in scope 1:.:.:quickshapes.pro:<TRUE>: -# _LOADED = "qt_module" - ## Scopes: ##################################################################### diff --git a/src/quickwidgets/CMakeLists.txt b/src/quickwidgets/CMakeLists.txt index a1df766eb2..e39477020e 100644 --- a/src/quickwidgets/CMakeLists.txt +++ b/src/quickwidgets/CMakeLists.txt @@ -25,6 +25,3 @@ add_qt_module(QuickWidgets Qt::Quick Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:quickwidgets.pro:<TRUE>: -# _LOADED = "qt_module" diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt index 67dee9c4ba..fc1f44d336 100644 --- a/tools/qml/.prev_CMakeLists.txt +++ b/tools/qml/.prev_CMakeLists.txt @@ -16,22 +16,25 @@ add_qt_tool(qml ) # Resources: +set(qml_resource_files + "conf/content/resizeItemToWindow.qml" + "conf/content/resizeWindowToItem.qml" + "conf/default.qml" + "conf/resizeToItem.qml" + "resources/qml-64.png" +) + add_qt_resource(qml "qml" PREFIX "/qt-project.org/QmlRuntime" FILES - conf/content/resizeItemToWindow.qml - conf/content/resizeWindowToItem.qml - conf/default.qml - conf/resizeToItem.qml - resources/qml-64.png + ${qml_resource_files} ) #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: # ICON = "resources/qml64.png" # QMAKE_TARGET_DESCRIPTION = "QML" "Runtime" -# _LOADED = "qt_tool" ## Scopes: ##################################################################### diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index bd8d32f880..84d4c9b803 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -27,22 +27,25 @@ set_source_files_properties( # special case end # Resources: +set(qml_resource_files + "conf/content/resizeItemToWindow.qml" + "conf/content/resizeWindowToItem.qml" + "conf/default.qml" + "conf/resizeToItem.qml" + "resources/qml-64.png" +) + add_qt_resource(qml "qml" PREFIX "/qt-project.org/QmlRuntime" FILES - conf/content/resizeItemToWindow.qml - conf/content/resizeWindowToItem.qml - conf/default.qml - conf/resizeToItem.qml - resources/qml-64.png + ${qml_resource_files} ) #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: # ICON = "resources/qml64.png" # QMAKE_TARGET_DESCRIPTION = "QML" "Runtime" -# _LOADED = "qt_tool" ## Scopes: ##################################################################### diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt index d4ad2adb6d..d509bad865 100644 --- a/tools/qmlcachegen/.prev_CMakeLists.txt +++ b/tools/qmlcachegen/.prev_CMakeLists.txt @@ -20,10 +20,9 @@ add_qt_tool(qmlcachegen ) #### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>: -# CMAKE_BIN_DIR = "$$cmakeRelativePath$$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX]" +# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])" # QMAKE_SUBSTITUTES = "cmake_config_file" # QMAKE_TARGET_DESCRIPTION = "QML" "Cache" "Generator" -# _LOADED = "cmake_functions" "qt_build_paths" "qt_tool" # _OPTION = "host_build" # build_integration.files = "qmlcache.prf" "qtquickcompiler.prf" # build_integration.path = "$$[QT_HOST_DATA]/mkspecs/features" @@ -36,10 +35,10 @@ add_qt_tool(qmlcachegen ##################################################################### #### Keys ignored in scope 2:.:.:qmlcachegen.pro:prefix_build: -# INSTALLS = "build_integration" "cmake_build_integration" +# INSTALLS = "cmake_build_integration" "build_integration" #### Keys ignored in scope 3:.:.:qmlcachegen.pro:else: -# COPIES = "build_integration" "cmake_build_integration" +# COPIES = "cmake_build_integration" "build_integration" #### Keys ignored in scope 4:.:.:qmlcachegen.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_: # CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/" diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt index 253421bbc4..4d82c9ce3e 100644 --- a/tools/qmlcachegen/CMakeLists.txt +++ b/tools/qmlcachegen/CMakeLists.txt @@ -21,10 +21,9 @@ add_qt_tool(qmlcachegen ) #### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>: -# CMAKE_BIN_DIR = "$$cmakeRelativePath$$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX]" +# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])" # QMAKE_SUBSTITUTES = "cmake_config_file" # QMAKE_TARGET_DESCRIPTION = "QML" "Cache" "Generator" -# _LOADED = "cmake_functions" "qt_build_paths" "qt_tool" # _OPTION = "host_build" # build_integration.files = "qmlcache.prf" "qtquickcompiler.prf" # build_integration.path = "$$[QT_HOST_DATA]/mkspecs/features" @@ -37,10 +36,10 @@ add_qt_tool(qmlcachegen ##################################################################### #### Keys ignored in scope 2:.:.:qmlcachegen.pro:prefix_build: -# INSTALLS = "build_integration" "cmake_build_integration" +# INSTALLS = "cmake_build_integration" "build_integration" #### Keys ignored in scope 3:.:.:qmlcachegen.pro:else: -# COPIES = "build_integration" "cmake_build_integration" +# COPIES = "cmake_build_integration" "build_integration" #### Keys ignored in scope 4:.:.:qmlcachegen.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_: # CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/" diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt index 036a554b51..9893d8e657 100644 --- a/tools/qmleasing/CMakeLists.txt +++ b/tools/qmleasing/CMakeLists.txt @@ -15,6 +15,7 @@ add_qt_executable(qmleasing segmentproperties.cpp segmentproperties.h splineeditor.cpp splineeditor.h PUBLIC_LIBRARIES + Qt::Gui Qt::Qml Qt::Quick Qt::Widgets @@ -23,11 +24,18 @@ add_qt_executable(qmleasing ) # Resources: -add_qt_resource(qmleasing "resources" PREFIX "/" FILES - Button.qml - preview.qml) +set(resources_resource_files + "Button.qml" + "preview.qml" +) + +add_qt_resource(qmleasing "resources" + PREFIX + "/" + FILES + ${resources_resource_files} +) #### Keys ignored in scope 1:.:.:qmleasing.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Easing" "Curve" "Editor" -# _LOADED = "qt_app" diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt index 9400878c15..cdaf3b8bbe 100644 --- a/tools/qmlimportscanner/.prev_CMakeLists.txt +++ b/tools/qmlimportscanner/.prev_CMakeLists.txt @@ -17,6 +17,59 @@ add_qt_tool(qmlimportscanner ) #### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>: +# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])" +# CMAKE_DEBUG_TYPE = <EMPTY> +# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML/get], $$[QT_INSTALL_PREFIX])" +# CMAKE_QML_PLUGIN_SUFFIX_RELEASE = <EMPTY> +# CMAKE_RELEASE_TYPE = <EMPTY> +# QMAKE_SUBSTITUTES = "cmake_config_file" # QMAKE_TARGET_DESCRIPTION = "QML" "Import" "Scanner" -# _LOADED = "qt_tool" # _OPTION = "host_build" +# cmake_build_integration.files = "$$cmake_config_file.output" "$$PWD/Qt5QmlImportScannerTemplate.cpp.in" +# cmake_build_integration.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5QmlImportScanner" +# cmake_config_file.input = "$$PWD/Qt5QmlImportScannerConfig.cmake.in" +# cmake_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5QmlImportScanner/Qt5QmlImportScannerConfig.cmake" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qmlimportscanner.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_: +# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/" +# CMAKE_BIN_DIR_IS_ABSOLUTE = "True" + +#### Keys ignored in scope 3:.:.:qmlimportscanner.pro:CMAKE_QML_DIR___contains___^\\.\\./._x_: +# CMAKE_QML_DIR = "$$[QT_INSTALL_QML/get]/" +# CMAKE_QML_DIR_IS_ABSOLUTE = "True" + +#### Keys ignored in scope 4:.:.:qmlimportscanner.pro:static OR staticlib: +# CMAKE_STATIC_TYPE = "true" + +#### Keys ignored in scope 5:.:.:qmlimportscanner.pro:WIN32: +# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = "d" + +#### Keys ignored in scope 7:.:.:qmlimportscanner.pro:APPLE: +# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = "_debug" + +#### Keys ignored in scope 8:.:.:qmlimportscanner.pro:else: +# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = <EMPTY> + +#### Keys ignored in scope 9:.:.:qmlimportscanner.pro:( QT_FEATURE_debug_and_release OR QT_CONFIG___contains___debug,debug OR release ): +# CMAKE_DEBUG_TYPE = "debug" + +#### Keys ignored in scope 10:.:.:qmlimportscanner.pro:( QT_FEATURE_debug_and_release OR QT_CONFIG___contains___release,debug OR release ): +# CMAKE_RELEASE_TYPE = "release" + +#### Keys ignored in scope 11:.:.:qmlimportscanner.pro:QT_FEATURE_debug_and_release: +# CMAKE_DEBUG_AND_RELEASE = "TRUE" + +#### Keys ignored in scope 12:.:.:qmlimportscanner.pro:else: +# CMAKE_DEBUG_AND_RELEASE = "FALSE" + +#### Keys ignored in scope 13:.:.:qmlimportscanner.pro:QMAKE_HOST.os___equals___Windows: +# CMAKE_BIN_SUFFIX = ".exe" + +#### Keys ignored in scope 14:.:.:qmlimportscanner.pro:prefix_build: +# INSTALLS = "cmake_build_integration" + +#### Keys ignored in scope 15:.:.:qmlimportscanner.pro:else: +# COPIES = "cmake_build_integration" diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt index 8bd1191b82..05f8837880 100644 --- a/tools/qmlimportscanner/CMakeLists.txt +++ b/tools/qmlimportscanner/CMakeLists.txt @@ -18,6 +18,59 @@ add_qt_tool(qmlimportscanner ) #### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>: +# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])" +# CMAKE_DEBUG_TYPE = <EMPTY> +# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML/get], $$[QT_INSTALL_PREFIX])" +# CMAKE_QML_PLUGIN_SUFFIX_RELEASE = <EMPTY> +# CMAKE_RELEASE_TYPE = <EMPTY> +# QMAKE_SUBSTITUTES = "cmake_config_file" # QMAKE_TARGET_DESCRIPTION = "QML" "Import" "Scanner" -# _LOADED = "qt_tool" # _OPTION = "host_build" +# cmake_build_integration.files = "$$cmake_config_file.output" "$$PWD/Qt5QmlImportScannerTemplate.cpp.in" +# cmake_build_integration.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5QmlImportScanner" +# cmake_config_file.input = "$$PWD/Qt5QmlImportScannerConfig.cmake.in" +# cmake_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5QmlImportScanner/Qt5QmlImportScannerConfig.cmake" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qmlimportscanner.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_: +# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/" +# CMAKE_BIN_DIR_IS_ABSOLUTE = "True" + +#### Keys ignored in scope 3:.:.:qmlimportscanner.pro:CMAKE_QML_DIR___contains___^\\.\\./._x_: +# CMAKE_QML_DIR = "$$[QT_INSTALL_QML/get]/" +# CMAKE_QML_DIR_IS_ABSOLUTE = "True" + +#### Keys ignored in scope 4:.:.:qmlimportscanner.pro:static OR staticlib: +# CMAKE_STATIC_TYPE = "true" + +#### Keys ignored in scope 5:.:.:qmlimportscanner.pro:WIN32: +# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = "d" + +#### Keys ignored in scope 7:.:.:qmlimportscanner.pro:APPLE: +# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = "_debug" + +#### Keys ignored in scope 8:.:.:qmlimportscanner.pro:else: +# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = <EMPTY> + +#### Keys ignored in scope 9:.:.:qmlimportscanner.pro:( QT_FEATURE_debug_and_release OR QT_CONFIG___contains___debug,debug OR release ): +# CMAKE_DEBUG_TYPE = "debug" + +#### Keys ignored in scope 10:.:.:qmlimportscanner.pro:( QT_FEATURE_debug_and_release OR QT_CONFIG___contains___release,debug OR release ): +# CMAKE_RELEASE_TYPE = "release" + +#### Keys ignored in scope 11:.:.:qmlimportscanner.pro:QT_FEATURE_debug_and_release: +# CMAKE_DEBUG_AND_RELEASE = "TRUE" + +#### Keys ignored in scope 12:.:.:qmlimportscanner.pro:else: +# CMAKE_DEBUG_AND_RELEASE = "FALSE" + +#### Keys ignored in scope 13:.:.:qmlimportscanner.pro:QMAKE_HOST.os___equals___Windows: +# CMAKE_BIN_SUFFIX = ".exe" + +#### Keys ignored in scope 14:.:.:qmlimportscanner.pro:prefix_build: +# INSTALLS = "cmake_build_integration" + +#### Keys ignored in scope 15:.:.:qmlimportscanner.pro:else: +# COPIES = "cmake_build_integration" diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt index 037ffdb8c5..2c3b500e03 100644 --- a/tools/qmljs/.prev_CMakeLists.txt +++ b/tools/qmljs/.prev_CMakeLists.txt @@ -41,7 +41,6 @@ add_qt_tool(qmljs #### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "JavaScript" "Tool" # TEMPLATE = "app" -# _LOADED = "qt_tool" ## Scopes: ##################################################################### @@ -51,7 +50,7 @@ extend_target(qmljs CONDITION WIN32 NOMINMAX ) -extend_target(qmljs CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386")" OR isEqual(QT_ARCH,"x86_64)) +extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) @@ -76,12 +75,12 @@ extend_target(qmljs CONDITION NOT disassembler WTF_USE_UDIS86=0 ) -extend_target(qmljs CONDITION (CMAKE_BUILD_TYPE STREQUAL Release) +extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -extend_target(qmljs CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6)) +extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt index 14a9304bd1..300a9ac47a 100644 --- a/tools/qmljs/CMakeLists.txt +++ b/tools/qmljs/CMakeLists.txt @@ -42,7 +42,6 @@ add_qt_tool(qmljs #### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "JavaScript" "Tool" # TEMPLATE = "app" -# _LOADED = "qt_tool" ## Scopes: ##################################################################### @@ -52,7 +51,7 @@ extend_target(qmljs CONDITION WIN32 NOMINMAX ) -extend_target(qmljs CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) # special case +extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) @@ -77,12 +76,12 @@ extend_target(qmljs CONDITION NOT disassembler WTF_USE_UDIS86=0 ) -extend_target(qmljs CONDITION (CMAKE_BUILD_TYPE STREQUAL Release) +extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -extend_target(qmljs CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6)) +extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt index 9970e494b6..cdc76dd106 100644 --- a/tools/qmllint/.prev_CMakeLists.txt +++ b/tools/qmllint/.prev_CMakeLists.txt @@ -21,5 +21,4 @@ add_qt_tool(qmllint #### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Syntax" "Verifier" -# _LOADED = "qt_tool" # _OPTION = "host_build" diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt index 5b3128458f..949e6e51fa 100644 --- a/tools/qmllint/CMakeLists.txt +++ b/tools/qmllint/CMakeLists.txt @@ -22,5 +22,4 @@ add_qt_tool(qmllint #### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Syntax" "Verifier" -# _LOADED = "qt_tool" # _OPTION = "host_build" diff --git a/tools/qmlmin/.prev_CMakeLists.txt b/tools/qmlmin/.prev_CMakeLists.txt index 9097a219aa..39df27a3bd 100644 --- a/tools/qmlmin/.prev_CMakeLists.txt +++ b/tools/qmlmin/.prev_CMakeLists.txt @@ -15,5 +15,4 @@ add_qt_tool(qmlmin #### Keys ignored in scope 1:.:.:qmlmin.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML/JS" "Minifier" -# _LOADED = "qt_tool" # _OPTION = "host_build" diff --git a/tools/qmlmin/CMakeLists.txt b/tools/qmlmin/CMakeLists.txt index 046cd6d8fe..73d764aace 100644 --- a/tools/qmlmin/CMakeLists.txt +++ b/tools/qmlmin/CMakeLists.txt @@ -16,5 +16,4 @@ add_qt_tool(qmlmin #### Keys ignored in scope 1:.:.:qmlmin.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML/JS" "Minifier" -# _LOADED = "qt_tool" # _OPTION = "host_build" diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt index c9c78e6a55..561a1cc6d9 100644 --- a/tools/qmlplugindump/.prev_CMakeLists.txt +++ b/tools/qmlplugindump/.prev_CMakeLists.txt @@ -14,6 +14,7 @@ add_qt_tool(qmlplugindump Qt::QmlPrivate Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::Gui Qt::Qml Qt::Quick ) @@ -21,7 +22,6 @@ add_qt_tool(qmlplugindump #### Keys ignored in scope 1:.:.:qmlplugindump.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Plugin" "Metadata" "Dumper" # QTPLUGIN.platforms = "qminimal" -# _LOADED = "qt_tool" ## Scopes: ##################################################################### @@ -35,6 +35,3 @@ extend_target(qmlplugindump CONDITION APPLE_OSX LINK_OPTIONS "-Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote$$PWD/Info.plist" ) - -#### Keys ignored in scope 3:.:.:qmlplugindump.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt index 67abd0e516..57f96a1f94 100644 --- a/tools/qmlplugindump/CMakeLists.txt +++ b/tools/qmlplugindump/CMakeLists.txt @@ -15,6 +15,7 @@ add_qt_tool(qmlplugindump Qt::QmlPrivate Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::Gui Qt::Qml Qt::Quick ) @@ -22,7 +23,6 @@ add_qt_tool(qmlplugindump #### Keys ignored in scope 1:.:.:qmlplugindump.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Plugin" "Metadata" "Dumper" # QTPLUGIN.platforms = "qminimal" -# _LOADED = "qt_tool" ## Scopes: ##################################################################### @@ -36,6 +36,3 @@ extend_target(qmlplugindump CONDITION APPLE_OSX LINK_OPTIONS "-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" # special case ) - -#### Keys ignored in scope 3:.:.:qmlplugindump.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt index 4fbad0984b..c1c40d5fbf 100644 --- a/tools/qmlpreview/.prev_CMakeLists.txt +++ b/tools/qmlpreview/.prev_CMakeLists.txt @@ -18,4 +18,3 @@ add_qt_tool(qmlpreview #### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Preview" -# _LOADED = "qt_tool" diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt index 84397a23ff..7e0b808f2c 100644 --- a/tools/qmlpreview/CMakeLists.txt +++ b/tools/qmlpreview/CMakeLists.txt @@ -19,4 +19,3 @@ add_qt_tool(qmlpreview #### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Preview" -# _LOADED = "qt_tool" diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt index 0bed3213bd..1d6ac20ad6 100644 --- a/tools/qmlprofiler/.prev_CMakeLists.txt +++ b/tools/qmlprofiler/.prev_CMakeLists.txt @@ -21,4 +21,3 @@ add_qt_tool(qmlprofiler #### Keys ignored in scope 1:.:.:qmlprofiler.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Profiler" -# _LOADED = "qt_tool" diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt index d0b46b5bef..672a782136 100644 --- a/tools/qmlprofiler/CMakeLists.txt +++ b/tools/qmlprofiler/CMakeLists.txt @@ -22,4 +22,3 @@ add_qt_tool(qmlprofiler #### Keys ignored in scope 1:.:.:qmlprofiler.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Profiler" -# _LOADED = "qt_tool" diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt index ba1c200bd0..da19ae27bb 100644 --- a/tools/qmlscene/.prev_CMakeLists.txt +++ b/tools/qmlscene/.prev_CMakeLists.txt @@ -21,7 +21,6 @@ add_qt_tool(qmlscene #### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Scene" "Viewer" -# _LOADED = "qt_tool" ## Scopes: ##################################################################### diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt index e9796871f5..1414009587 100644 --- a/tools/qmlscene/CMakeLists.txt +++ b/tools/qmlscene/CMakeLists.txt @@ -22,7 +22,6 @@ add_qt_tool(qmlscene #### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Scene" "Viewer" -# _LOADED = "qt_tool" ## Scopes: ##################################################################### diff --git a/tools/qmltestrunner/.prev_CMakeLists.txt b/tools/qmltestrunner/.prev_CMakeLists.txt index cace9385b7..c02d6e0226 100644 --- a/tools/qmltestrunner/.prev_CMakeLists.txt +++ b/tools/qmltestrunner/.prev_CMakeLists.txt @@ -8,10 +8,10 @@ add_qt_tool(qmltestrunner SOURCES main.cpp PUBLIC_LIBRARIES + Qt::Gui Qt::Qml Qt::QuickTest ) #### Keys ignored in scope 1:.:.:qmltestrunner.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Test" "Runner" -# _LOADED = "qt_tool" diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt index 5e942fe8ec..0823d57c00 100644 --- a/tools/qmltestrunner/CMakeLists.txt +++ b/tools/qmltestrunner/CMakeLists.txt @@ -9,10 +9,10 @@ add_qt_tool(qmltestrunner SOURCES main.cpp PUBLIC_LIBRARIES + Qt::Gui Qt::Qml Qt::QuickTest ) #### Keys ignored in scope 1:.:.:qmltestrunner.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Test" "Runner" -# _LOADED = "qt_tool" diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt index b70d63a605..77b3e59368 100644 --- a/tools/qmltime/CMakeLists.txt +++ b/tools/qmltime/CMakeLists.txt @@ -11,6 +11,7 @@ add_qt_executable(qmltime LIBRARIES Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::Gui Qt::Qml Qt::Quick ) @@ -21,6 +22,3 @@ add_qt_executable(qmltime ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qmltime.pro:APPLE_OSX: -# CONFIG = "-app_bundle" |