diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 15:23:08 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-06 13:19:37 +0200 |
| commit | 08adbefa131ef1c934f55cd61716c8ea836ddf02 (patch) | |
| tree | 0ae21548926596fb41e7e71c4bb14d1973245bde /tools/qml | |
| parent | c52a857c2b6b89abeddeee8489110ab9dd363e53 (diff) | |
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well.
Task-number: QTBUG-86815
Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/.prev_CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tools/qml/CMakeLists.txt | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt index 52f1082f02..7a278d970e 100644 --- a/tools/qml/.prev_CMakeLists.txt +++ b/tools/qml/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Runtime" SOURCES conf.h @@ -24,7 +24,7 @@ set(qml_resource_files "resources/qml-64.png" ) -qt_add_resource(${target_name} "qml" +qt_internal_add_resource(${target_name} "qml" PREFIX "/qt-project.org/QmlRuntime" FILES @@ -41,12 +41,12 @@ qt_add_resource(${target_name} "qml" ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Gui +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) @@ -59,7 +59,7 @@ qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" -qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index a069731aac..7c545ecb75 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Runtime" TOOLS_TARGET Qml # special case SOURCES @@ -41,7 +41,7 @@ set(qml_resource_files "resources/qml-64.png" ) -qt_add_resource(${target_name} "qml" +qt_internal_add_resource(${target_name} "qml" PREFIX "/qt-project.org/QmlRuntime" FILES @@ -58,12 +58,12 @@ qt_add_resource(${target_name} "qml" ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Gui +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) @@ -76,7 +76,7 @@ qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" -qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) |