diff options
31 files changed, 184 insertions, 74 deletions
diff --git a/src/imports/models/.prev_CMakeLists.txt b/src/imports/models/.prev_CMakeLists.txt new file mode 100644 index 0000000000..89d65a22dc --- /dev/null +++ b/src/imports/models/.prev_CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from models.pro. + +##################################################################### +## modelsplugin Plugin: +##################################################################### + +qt_add_qml_module(modelsplugin + URI "QtQml.Models" + VERSION "${CMAKE_PROJECT_VERSION}" + DESIGNER_SUPPORTED + CLASSNAME QtQmlModelsPlugin + SKIP_TYPE_REGISTRATION + PLUGIN_OPTIONAL + SOURCES + plugin.cpp + PUBLIC_LIBRARIES + Qt::QmlModelsPrivate + Qt::QmlPrivate +) + +#### Keys ignored in scope 1:.:.:models.pro:<TRUE>: +# CXX_MODULE = "qml" +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtQml/Models" diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index 7d08563f59..89d65a22dc 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -9,7 +9,8 @@ qt_add_qml_module(modelsplugin VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlModelsPlugin - PLUGIN_OPTIONAL # special case + SKIP_TYPE_REGISTRATION + PLUGIN_OPTIONAL SOURCES plugin.cpp PUBLIC_LIBRARIES diff --git a/src/imports/workerscript/.prev_CMakeLists.txt b/src/imports/workerscript/.prev_CMakeLists.txt new file mode 100644 index 0000000000..2d437a04da --- /dev/null +++ b/src/imports/workerscript/.prev_CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from workerscript.pro. + +##################################################################### +## workerscriptplugin Plugin: +##################################################################### + +qt_add_qml_module(workerscriptplugin + URI "QtQml.WorkerScript" + VERSION "${CMAKE_PROJECT_VERSION}" + DESIGNER_SUPPORTED + CLASSNAME QtQmlWorkerScriptPlugin + SKIP_TYPE_REGISTRATION + PLUGIN_OPTIONAL + SOURCES + plugin.cpp + PUBLIC_LIBRARIES + Qt::QmlPrivate + Qt::QmlWorkerScriptPrivate +) + +#### Keys ignored in scope 1:.:.:workerscript.pro:<TRUE>: +# CXX_MODULE = "qml" +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtQml/WorkerScript" diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index b1e98b2af6..2d437a04da 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -9,7 +9,8 @@ qt_add_qml_module(workerscriptplugin VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlWorkerScriptPlugin - PLUGIN_OPTIONAL # special case + SKIP_TYPE_REGISTRATION + PLUGIN_OPTIONAL SOURCES plugin.cpp PUBLIC_LIBRARIES diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt index 5809054824..365aa30e40 100644 --- a/src/qmltyperegistrar/.prev_CMakeLists.txt +++ b/src/qmltyperegistrar/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmltyperegistrar Tool: ##################################################################### -qt_add_tool(qmltyperegistrar +qt_get_tool_target_name(target_name qmltyperegistrar) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Types Registrar" SOURCES ../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt index f7f68bf3dd..ad603e897c 100644 --- a/src/qmltyperegistrar/CMakeLists.txt +++ b/src/qmltyperegistrar/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmltyperegistrar Tool: ##################################################################### -qt_add_tool(qmltyperegistrar +qt_get_tool_target_name(target_name qmltyperegistrar) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Types Registrar" TOOLS_TARGET Qml # special case SOURCES diff --git a/src/quick/.prev_CMakeLists.txt b/src/quick/.prev_CMakeLists.txt index fa968dbe9d..2774d1cb15 100644 --- a/src/quick/.prev_CMakeLists.txt +++ b/src/quick/.prev_CMakeLists.txt @@ -392,6 +392,12 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_path util/qquickpathinterpolator.cpp util/qquickpathinterpolator_p.h ) +qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 + SOURCES + items/qquickframebufferobject.cpp items/qquickframebufferobject.h + util/qquickopenglutils.cpp util/qquickopenglutils.h +) + qt_extend_target(Quick CONDITION QT_FEATURE_thread SOURCES scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop_p.h @@ -481,11 +487,6 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect items/qquickshadereffectsource.cpp items/qquickshadereffectsource_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 - SOURCES - items/qquickframebufferobject.cpp items/qquickframebufferobject.h -) - qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas SOURCES items/context2d/qquickcanvascontext.cpp items/context2d/qquickcanvascontext_p.h diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 4eb0738c8d..74c1600a40 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -392,6 +392,12 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_path util/qquickpathinterpolator.cpp util/qquickpathinterpolator_p.h ) +qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 + SOURCES + items/qquickframebufferobject.cpp items/qquickframebufferobject.h + util/qquickopenglutils.cpp util/qquickopenglutils.h +) + qt_extend_target(Quick CONDITION QT_FEATURE_thread SOURCES scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop_p.h @@ -481,12 +487,6 @@ qt_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect items/qquickshadereffectsource.cpp items/qquickshadereffectsource_p.h ) -qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 - SOURCES - items/qquickframebufferobject.cpp items/qquickframebufferobject.h - util/qquickopenglutils.cpp util/qquickopenglutils.h -) - qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas SOURCES items/context2d/qquickcanvascontext.cpp items/context2d/qquickcanvascontext_p.h diff --git a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt index 3c69aa04d4..5c3581a7e9 100644 --- a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt +++ b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt @@ -4,7 +4,8 @@ ## qjstest Tool: ##################################################################### -qt_add_tool(qjstest +qt_get_tool_target_name(target_name qjstest) +qt_add_tool(${target_name} TARGET_DESCRIPTION "Javascript test runner" SOURCES main.cpp diff --git a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt new file mode 100644 index 0000000000..65272b0c7f --- /dev/null +++ b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt @@ -0,0 +1,37 @@ +# Generated from qmltyperegistrar.pro. + +##################################################################### +## tst_qmltyperegistrar Test: +##################################################################### + +qt_add_test(tst_qmltyperegistrar + SOURCES + hppheader.hpp + noextheader + tst_qmltyperegistrar.cpp tst_qmltyperegistrar.h + INCLUDE_DIRECTORIES + foreign + PUBLIC_LIBRARIES + # Remove: Lforeign + Qt::Qml + foreign +) + +#### Keys ignored in scope 2:.:.:tst_qmltyperegistrar.pro:<TRUE>: +# QMLTYPES_FILENAME = "tst_qmltyperegistrar.qmltypes" +# QML_FOREIGN_METATYPES = "foreign/foreign_metatypes.json" +# QML_IMPORT_NAME = "QmlTypeRegistrarTest" +# QML_IMPORT_VERSION = "1.0" +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +set_target_properties(tst_qmltyperegistrar PROPERTIES + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI QmlTypeRegistrarTest + QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes +) + +qt6_qml_type_registration(tst_qmltyperegistrar) +add_subdirectory(foreign) diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt index 4bef156880..4af6313c65 100644 --- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt @@ -30,10 +30,9 @@ target_compile_definitions(tst_qmltyperegistrar PRIVATE BUILD_WITH_CMAKE) # spec ##################################################################### set_target_properties(tst_qmltyperegistrar PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI QmlTypeRegistrarTest - QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes # special case + QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes ) qt6_qml_type_registration(tst_qmltyperegistrar ${json_list}) # special case diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt index 0c291d5292..52f1082f02 100644 --- a/tools/qml/.prev_CMakeLists.txt +++ b/tools/qml/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qml Tool: ##################################################################### -qt_add_tool(qml +qt_get_tool_target_name(target_name qml) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Runtime" SOURCES conf.h @@ -23,7 +24,7 @@ set(qml_resource_files "resources/qml-64.png" ) -qt_add_resource(qml "qml" +qt_add_resource(${target_name} "qml" PREFIX "/qt-project.org/QmlRuntime" FILES @@ -40,12 +41,12 @@ qt_add_resource(qml "qml" ## Scopes: ##################################################################### -qt_extend_target(qml CONDITION TARGET Qt::Gui +qt_extend_target(${target_name} CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) -qt_extend_target(qml CONDITION TARGET Qt::Widgets +qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) @@ -58,14 +59,14 @@ qt_extend_target(qml CONDITION TARGET Qt::Widgets # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" -qt_extend_target(qml CONDITION QT_FEATURE_qml_debug +qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) -set_target_properties(qml PROPERTIES +set_target_properties(${target_name} PROPERTIES QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI QmlRuntime.Config ) -qt6_qml_type_registration(qml) +qt6_qml_type_registration(${target_name}) diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index d4f803ff04..a069731aac 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -4,7 +4,8 @@ ## qml Tool: ##################################################################### -qt_add_tool(qml +qt_get_tool_target_name(target_name qml) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Runtime" TOOLS_TARGET Qml # special case SOURCES @@ -40,7 +41,7 @@ set(qml_resource_files "resources/qml-64.png" ) -qt_add_resource(qml "qml" +qt_add_resource(${target_name} "qml" PREFIX "/qt-project.org/QmlRuntime" FILES @@ -57,12 +58,12 @@ qt_add_resource(qml "qml" ## Scopes: ##################################################################### -qt_extend_target(qml CONDITION TARGET Qt::Gui +qt_extend_target(${target_name} CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) -qt_extend_target(qml CONDITION TARGET Qt::Widgets +qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) @@ -75,14 +76,14 @@ qt_extend_target(qml CONDITION TARGET Qt::Widgets # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" -qt_extend_target(qml CONDITION QT_FEATURE_qml_debug +qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) -set_target_properties(qml PROPERTIES +set_target_properties(${target_name} PROPERTIES QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI QmlRuntime.Config ) -qt6_qml_type_registration(qml) +qt6_qml_type_registration(${target_name}) diff --git a/tools/qmlformat/.prev_CMakeLists.txt b/tools/qmlformat/.prev_CMakeLists.txt index 940e68d9d0..e99eca96e1 100644 --- a/tools/qmlformat/.prev_CMakeLists.txt +++ b/tools/qmlformat/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlformat Tool: ##################################################################### -qt_add_tool(qmlformat +qt_get_tool_target_name(target_name qmlformat) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Formatter" SOURCES commentastvisitor.cpp commentastvisitor.h diff --git a/tools/qmlformat/CMakeLists.txt b/tools/qmlformat/CMakeLists.txt index bfafe972ef..73d106a1c1 100644 --- a/tools/qmlformat/CMakeLists.txt +++ b/tools/qmlformat/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlformat Tool: ##################################################################### -qt_add_tool(qmlformat +qt_get_tool_target_name(target_name qmlformat) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Formatter" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt index 0ff1581279..2d589acf24 100644 --- a/tools/qmlimportscanner/.prev_CMakeLists.txt +++ b/tools/qmlimportscanner/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlimportscanner Tool: ##################################################################### -qt_add_tool(qmlimportscanner +qt_get_tool_target_name(target_name qmlimportscanner) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Import Scanner" SOURCES ../shared/resourcefilemapper.cpp ../shared/resourcefilemapper.h diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt index 068b9c3078..dfe24cfc26 100644 --- a/tools/qmlimportscanner/CMakeLists.txt +++ b/tools/qmlimportscanner/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlimportscanner Tool: ##################################################################### -qt_add_tool(qmlimportscanner +qt_get_tool_target_name(target_name qmlimportscanner) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Import Scanner" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt index 3bbec9b02a..621f54a18b 100644 --- a/tools/qmljs/.prev_CMakeLists.txt +++ b/tools/qmljs/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmljs Tool: ##################################################################### -qt_add_tool(qmljs +qt_get_tool_target_name(target_name qmljs) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML JavaScript Tool" SOURCES qmljs.cpp @@ -44,42 +45,42 @@ qt_add_tool(qmljs ## Scopes: ##################################################################### -qt_extend_target(qmljs CONDITION WIN32 +qt_extend_target(${target_name} CONDITION WIN32 DEFINES NOMINMAX ) -qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION NOT disassembler +qt_extend_target(${target_name} CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_extend_target(${target_name} 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 257f5fdb6e..e4e2cf1b7a 100644 --- a/tools/qmljs/CMakeLists.txt +++ b/tools/qmljs/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmljs Tool: ##################################################################### -qt_add_tool(qmljs +qt_get_tool_target_name(target_name qmljs) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML JavaScript Tool" TOOLS_TARGET Qml # special case SOURCES @@ -45,42 +46,42 @@ qt_add_tool(qmljs ## Scopes: ##################################################################### -qt_extend_target(qmljs CONDITION WIN32 +qt_extend_target(${target_name} CONDITION WIN32 DEFINES NOMINMAX ) -qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION NOT disassembler +qt_extend_target(${target_name} CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_extend_target(${target_name} 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 b0bc24d89d..2bb98260f6 100644 --- a/tools/qmllint/.prev_CMakeLists.txt +++ b/tools/qmllint/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmllint Tool: ##################################################################### -qt_add_tool(qmllint +qt_get_tool_target_name(target_name qmllint) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Syntax Verifier" SOURCES ../shared/componentversion.cpp ../shared/componentversion.h diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt index a42f700f45..03b7854682 100644 --- a/tools/qmllint/CMakeLists.txt +++ b/tools/qmllint/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmllint Tool: ##################################################################### -qt_add_tool(qmllint +qt_get_tool_target_name(target_name qmllint) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Syntax Verifier" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt index 078c20bf08..79a4b0b18d 100644 --- a/tools/qmlplugindump/.prev_CMakeLists.txt +++ b/tools/qmlplugindump/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlplugindump Tool: ##################################################################### -qt_add_tool(qmlplugindump +qt_get_tool_target_name(target_name qmlplugindump) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Plugin Metadata Dumper" SOURCES ../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h @@ -27,12 +28,12 @@ qt_add_tool(qmlplugindump ## Scopes: ##################################################################### -qt_extend_target(qmlplugindump CONDITION TARGET Qt::Widgets +qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(qmlplugindump CONDITION MACOS +qt_extend_target(${target_name} CONDITION MACOS LINK_OPTIONS "-Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote$$PWD/Info.plist" ) diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt index 63c0f398a4..cbeb03f38b 100644 --- a/tools/qmlplugindump/CMakeLists.txt +++ b/tools/qmlplugindump/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlplugindump Tool: ##################################################################### -qt_add_tool(qmlplugindump +qt_get_tool_target_name(target_name qmlplugindump) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Plugin Metadata Dumper" TOOLS_TARGET Qml # special case SOURCES @@ -28,12 +29,12 @@ qt_add_tool(qmlplugindump ## Scopes: ##################################################################### -qt_extend_target(qmlplugindump CONDITION TARGET Qt::Widgets +qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(qmlplugindump CONDITION MACOS +qt_extend_target(${target_name} CONDITION MACOS LINK_OPTIONS "-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" # special case ) diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt index a2ebba7f50..e8cfaa528a 100644 --- a/tools/qmlpreview/.prev_CMakeLists.txt +++ b/tools/qmlpreview/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlpreview Tool: ##################################################################### -qt_add_tool(qmlpreview +qt_get_tool_target_name(target_name qmlpreview) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Preview" SOURCES main.cpp diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt index 1952e2513d..3df5a921cf 100644 --- a/tools/qmlpreview/CMakeLists.txt +++ b/tools/qmlpreview/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlpreview Tool: ##################################################################### -qt_add_tool(qmlpreview +qt_get_tool_target_name(target_name qmlpreview) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Preview" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt index 7969714e8a..27121615bd 100644 --- a/tools/qmlprofiler/.prev_CMakeLists.txt +++ b/tools/qmlprofiler/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlprofiler Tool: ##################################################################### -qt_add_tool(qmlprofiler +qt_get_tool_target_name(target_name qmlprofiler) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Profiler" SOURCES commandlistener.cpp commandlistener.h diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt index 79c1b732ee..77943aa397 100644 --- a/tools/qmlprofiler/CMakeLists.txt +++ b/tools/qmlprofiler/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlprofiler Tool: ##################################################################### -qt_add_tool(qmlprofiler +qt_get_tool_target_name(target_name qmlprofiler) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Profiler" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt index 61edc7deff..c1f7a78dd3 100644 --- a/tools/qmlscene/.prev_CMakeLists.txt +++ b/tools/qmlscene/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlscene Tool: ##################################################################### -qt_add_tool(qmlscene +qt_get_tool_target_name(target_name qmlscene) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Scene Viewer" SOURCES main.cpp @@ -25,12 +26,12 @@ qt_add_tool(qmlscene ## Scopes: ##################################################################### -qt_extend_target(qmlscene CONDITION TARGET Qt::Widgets +qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(qmlscene CONDITION QT_FEATURE_qml_debug +qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt index c5dda83fd8..7e385653c1 100644 --- a/tools/qmlscene/CMakeLists.txt +++ b/tools/qmlscene/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmlscene Tool: ##################################################################### -qt_add_tool(qmlscene +qt_get_tool_target_name(target_name qmlscene) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Scene Viewer" TOOLS_TARGET Qml # special case SOURCES @@ -26,12 +27,12 @@ qt_add_tool(qmlscene ## Scopes: ##################################################################### -qt_extend_target(qmlscene CONDITION TARGET Qt::Widgets +qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(qmlscene CONDITION QT_FEATURE_qml_debug +qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qmltestrunner/.prev_CMakeLists.txt b/tools/qmltestrunner/.prev_CMakeLists.txt index e27f88a2ea..4744ad5c80 100644 --- a/tools/qmltestrunner/.prev_CMakeLists.txt +++ b/tools/qmltestrunner/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmltestrunner Tool: ##################################################################### -qt_add_tool(qmltestrunner +qt_get_tool_target_name(target_name qmltestrunner) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Test Runner" SOURCES main.cpp diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt index f1df677621..370c1054a6 100644 --- a/tools/qmltestrunner/CMakeLists.txt +++ b/tools/qmltestrunner/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmltestrunner Tool: ##################################################################### -qt_add_tool(qmltestrunner +qt_get_tool_target_name(target_name qmltestrunner) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Test Runner" TOOLS_TARGET Qml # special case SOURCES |