diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 14:09:06 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 15:51:40 +0200 |
| commit | 0f19f571ee307dbe5fdebeb489d0c6cfcc8fa5ef (patch) | |
| tree | 838ebcbebc0429dfeba724a1b052e577f5908b06 /tools/qmlscene | |
| parent | 360a22838a9f6127702c35d9feb67560692df128 (diff) | |
CMake: Regenerate projects
We need the qt_add_tool changes to successfully configure qemu builds.
The rest of the changes are just to be in sync with the .pro files.
Change-Id: I7bcc08ac58f57a5761aedef09761428c55235289
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tools/qmlscene')
| -rw-r--r-- | tools/qmlscene/.prev_CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tools/qmlscene/CMakeLists.txt | 7 |
2 files changed, 8 insertions, 6 deletions
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 ) |