diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 13:31:06 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-15 12:24:51 +0000 |
| commit | ba494aaa24defe1401f621b791891e696b308756 (patch) | |
| tree | 3617f29e9625fafbf94609ac79b2decd4033107c /tools/qml | |
| parent | 91e32f86b53bb930405a58e19c84746ee85cdf89 (diff) | |
Regenerate all projects with new CMake API version
Change-Id: Ie0db35f674137c229eaf049616f38f8e818f7092
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@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 fc1f44d336..9c65660ece 100644 --- a/tools/qml/.prev_CMakeLists.txt +++ b/tools/qml/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qml Tool: ##################################################################### -add_qt_tool(qml +qt_add_tool(qml SOURCES conf.h main.cpp @@ -24,7 +24,7 @@ set(qml_resource_files "resources/qml-64.png" ) -add_qt_resource(qml "qml" +qt_add_resource(qml "qml" PREFIX "/qt-project.org/QmlRuntime" FILES @@ -39,12 +39,12 @@ add_qt_resource(qml "qml" ## Scopes: ##################################################################### -extend_target(qml CONDITION TARGET Qt::Gui +qt_extend_target(qml CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) -extend_target(qml CONDITION TARGET Qt::Widgets +qt_extend_target(qml CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) @@ -57,7 +57,7 @@ extend_target(qml CONDITION TARGET Qt::Widgets # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" -extend_target(qml CONDITION QT_FEATURE_qml_debug +qt_extend_target(qml CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index 84d4c9b803..12cec77288 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -4,7 +4,7 @@ ## qml Tool: ##################################################################### -add_qt_tool(qml +qt_add_tool(qml TOOLS_TARGET Qml # special case SOURCES conf.h @@ -35,7 +35,7 @@ set(qml_resource_files "resources/qml-64.png" ) -add_qt_resource(qml "qml" +qt_add_resource(qml "qml" PREFIX "/qt-project.org/QmlRuntime" FILES @@ -50,12 +50,12 @@ add_qt_resource(qml "qml" ## Scopes: ##################################################################### -extend_target(qml CONDITION TARGET Qt::Gui +qt_extend_target(qml CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) -extend_target(qml CONDITION TARGET Qt::Widgets +qt_extend_target(qml CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) @@ -68,7 +68,7 @@ extend_target(qml CONDITION TARGET Qt::Widgets # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" -extend_target(qml CONDITION QT_FEATURE_qml_debug +qt_extend_target(qml CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) |