feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qml2puppet: we only support Qt6 these days

Browse Source 
This amends 59ecf10f06
"fix QT_VERSION_MAJOR is empty in single builds"

Task-number: QDS-10669
Change-Id: I730fe8d36b22fce82ff71b0f9aee5657d6380f1f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Tim Jenssen
2023-09-14 12:16:12 +02:00
parent 650dabdc25
commit 955534ce45
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tools/qml2puppet/CMakeLists.txt
View File

@@ -21,9 +21,6 @@ if (NOT QT_CREATOR_API_DEFINED)
COMPONENTS Concurrent Core Gui Network PrintSupport Qml Quick Sql Widgets Xml COMPONENTS Concurrent Core Gui Network PrintSupport Qml Quick Sql Widgets Xml
REQUIRED REQUIRED
) )
else()
# Qt Creator only supports Qt 6
set(QT_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
endif() endif()
if (NOT TARGET QmlPuppetCommunication) if (NOT TARGET QmlPuppetCommunication)
@@ -86,7 +83,7 @@ extend_qtc_executable(qml2puppet
nodeinstanceclientproxy.cpp nodeinstanceclientproxy.h nodeinstanceclientproxy.cpp nodeinstanceclientproxy.h
) )
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick3D QUIET) find_package(Qt6 COMPONENTS Quick3D QUIET)
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION TARGET Qt::Quick3D CONDITION TARGET Qt::Quick3D
FEATURE_INFO "Qt Quick 3D support" FEATURE_INFO "Qt Quick 3D support"
@@ -106,7 +103,7 @@ extend_qtc_executable(qml2puppet
icongizmoimageprovider.cpp icongizmoimageprovider.h icongizmoimageprovider.cpp icongizmoimageprovider.h
) )
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick3DAssetImport QUIET) find_package(Qt6 COMPONENTS Quick3DAssetImport QUIET)
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION TARGET Qt::Quick3DAssetImport CONDITION TARGET Qt::Quick3DAssetImport
FEATURE_INFO "Qt Quick 3D asset import" FEATURE_INFO "Qt Quick 3D asset import"
@@ -114,7 +111,7 @@ extend_qtc_executable(qml2puppet
DEFINES IMPORT_QUICK3D_ASSETS DEFINES IMPORT_QUICK3D_ASSETS
) )
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick3DParticles QUIET) find_package(Qt6 COMPONENTS Quick3DParticles QUIET)
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION TARGET Qt::Quick3DParticles CONDITION TARGET Qt::Quick3DParticles
FEATURE_INFO "Qt Quick 3D particles" FEATURE_INFO "Qt Quick 3D particles"
@@ -123,7 +120,7 @@ extend_qtc_executable(qml2puppet
) )
# Quick3DAssetUtils optionally depends on QuickTimeline, so find also it to make the CI build work # Quick3DAssetUtils optionally depends on QuickTimeline, so find also it to make the CI build work
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick3DAssetUtils QuickTimeline QUIET) find_package(Qt6 COMPONENTS Quick3DAssetUtils QuickTimeline QUIET)
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION TARGET Qt::Quick3DAssetUtils CONDITION TARGET Qt::Quick3DAssetUtils
FEATURE_INFO "Qt Quick 3D asset utils" FEATURE_INFO "Qt Quick 3D asset utils"