From 2c55b246c99ccb119f8129de1c83d0004736a7c8 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 26 Apr 2023 17:27:43 +0200 Subject: [PATCH] QmlDesigner: Increase Qt version condition We need Qt >= 6.4.3 for the module scanner. Change-Id: I496051e1ce6cbcb8100ede2e5026414799cc50ba Reviewed-by: Tim Jenssen Reviewed-by: Reviewed-by: Thomas Hartmann --- src/plugins/insight/CMakeLists.txt | 1 + src/plugins/qmldesigner/CMakeLists.txt | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/insight/CMakeLists.txt b/src/plugins/insight/CMakeLists.txt index e8a62940e7c..ec262638eef 100644 --- a/src/plugins/insight/CMakeLists.txt +++ b/src/plugins/insight/CMakeLists.txt @@ -1,4 +1,5 @@ add_qtc_plugin(Insight + CONDITION TARGET QtCreator::QmlDesigner PLUGIN_DEPENDS QtCreator::Core QtCreator::QtSupport QtCreator::QmlDesigner QtCreator::QmlProjectManager QtCreator::ProjectExplorer DEPENDS diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index a5d767e332a..89bf1ff4e45 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -37,6 +37,7 @@ extend_qtc_library(QmlDesignerUtils ) add_qtc_library(QmlDesignerCore STATIC + CONDITION Qt6_VERSION VERSION_GREATER_EQUAL 6.4.3 EXCLUDE_FROM_INSTALL DEPENDS Threads::Threads @@ -78,7 +79,7 @@ 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 DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate PUBLIC_DEFINES QDS_HAS_QMLPRIVATE @@ -423,7 +424,7 @@ set_property(SOURCE ${PROJECTSTORAGE_EXCLUDED_SOURCES} PROPERTY SKIP_AUTOMOC ON) add_qtc_plugin(QmlDesigner 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 Core ProjectExplorer QmlDesignerBase QmlJSEditor QmakeProjectManager QmlProjectManager QtSupport