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

QmlDesigner: Increase Qt version condition

Browse Source 
We need Qt >= 6.4.3 for the module scanner.

Change-Id: I496051e1ce6cbcb8100ede2e5026414799cc50ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2023-04-26 17:27:43 +02:00
parent f9619ef381
commit 2c55b246c9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/insight/CMakeLists.txt
View File

@@ -1,4 +1,5 @@
add_qtc_plugin(Insight add_qtc_plugin(Insight
CONDITION TARGET QtCreator::QmlDesigner
PLUGIN_DEPENDS PLUGIN_DEPENDS
QtCreator::Core QtCreator::QtSupport QtCreator::QmlDesigner QtCreator::QmlProjectManager QtCreator::ProjectExplorer QtCreator::Core QtCreator::QtSupport QtCreator::QmlDesigner QtCreator::QmlProjectManager QtCreator::ProjectExplorer
DEPENDS DEPENDS

5
src/plugins/qmldesigner/CMakeLists.txt
View File

@@ -37,6 +37,7 @@ extend_qtc_library(QmlDesignerUtils
) )
add_qtc_library(QmlDesignerCore STATIC add_qtc_library(QmlDesignerCore STATIC
CONDITION Qt6_VERSION VERSION_GREATER_EQUAL 6.4.3
EXCLUDE_FROM_INSTALL EXCLUDE_FROM_INSTALL
DEPENDS DEPENDS
Threads::Threads Threads::Threads
@@ -78,7 +79,7 @@ extend_qtc_library(QmlDesignerCore
) )
extend_qtc_library(QmlDesignerCore extend_qtc_library(QmlDesignerCore
CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.4.3 CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate
AND Qt6_VERSION VERSION_LESS 6.6.0 AND Qt6_VERSION VERSION_LESS 6.6.0
DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate
PUBLIC_DEFINES QDS_HAS_QMLPRIVATE PUBLIC_DEFINES QDS_HAS_QMLPRIVATE
@@ -423,7 +424,7 @@ set_property(SOURCE ${PROJECTSTORAGE_EXCLUDED_SOURCES} PROPERTY SKIP_AUTOMOC ON)
add_qtc_plugin(QmlDesigner add_qtc_plugin(QmlDesigner
PLUGIN_RECOMMENDS QmlPreview PLUGIN_RECOMMENDS QmlPreview
CONDITION Qt6_VERSION VERSION_GREATER_EQUAL 6.2.0 AND TARGET Qt::QuickWidgets AND TARGET Qt::Svg CONDITION Qt6_VERSION VERSION_GREATER_EQUAL 6.4.3 AND TARGET QmlDesignerCore AND TARGET Qt::QuickWidgets AND TARGET Qt::Svg
PLUGIN_DEPENDS PLUGIN_DEPENDS
Core ProjectExplorer QmlDesignerBase QmlJSEditor QmakeProjectManager QmlProjectManager Core ProjectExplorer QmlDesignerBase QmlJSEditor QmakeProjectManager QmlProjectManager
QtSupport QtSupport