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

QmlDesigner: Cleanup QmlDom requirements

Browse Source 
Change-Id: I6247388f6b685b71815d355f4768c823defcdc1f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2024-09-11 10:47:58 +02:00
parent 795949f2da
commit d8a3b1daed
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,5 @@
#only if the plugin is requested by qtc_plugin_enabled continue if not stop as early as possible #only if the plugin is requested by qtc_plugin_enabled continue if not stop as early as possible
find_package(Qt6 COMPONENTS QmlDomPrivate QmlCompilerPrivate QUIET)
set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/qmldesigner") set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/qmldesigner")
if (APPLE) if (APPLE)
set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner") set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner")

8
src/plugins/qmldesigner/libs/designercore/CMakeLists.txt
View File

@@ -1,5 +1,8 @@
if (IS_SUPPORTED_PROJECTSTORAGE_QT)
find_package(Qt6 COMPONENTS QmlDomPrivate QmlCompiler REQUIRED)
endif()
add_qtc_library(QmlDesignerCore add_qtc_library(QmlDesignerCore
CONDITION TARGET Qt6::QmlPrivate AND TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate
PROPERTIES SKIP_AUTOUIC ON PROPERTIES SKIP_AUTOUIC ON
DEPENDS DEPENDS
Threads::Threads Threads::Threads
@@ -8,8 +11,6 @@ add_qtc_library(QmlDesignerCore
Qt::Qml Qt::Qml
Qt::QmlPrivate Qt::QmlPrivate
Qt::Quick Qt::Quick
Qt6::QmlDomPrivate
Qt6::QmlCompilerPrivate
QmlJS QmlJS
TextEditorSupport TextEditorSupport
QmlDesignerSettings QmlDesignerSettings
@@ -63,6 +64,7 @@ extend_qtc_library(QmlDesignerCore
extend_qtc_library(QmlDesignerCore extend_qtc_library(QmlDesignerCore
CONDITION IS_SUPPORTED_PROJECTSTORAGE_QT CONDITION IS_SUPPORTED_PROJECTSTORAGE_QT
DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate
PUBLIC_DEFINES QDS_BUILD_QMLPARSER PUBLIC_DEFINES QDS_BUILD_QMLPARSER
) )
extend_qtc_library(QmlDesignerCore extend_qtc_library(QmlDesignerCore

4
tests/unit/tests/unittests/projectstorage/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ extend_qtc_test(unittest
) )
extend_qtc_test(unittest extend_qtc_test(unittest
CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND IS_SUPPORTED_PROJECTSTORAGE_QT CONDITION IS_SUPPORTED_PROJECTSTORAGE_QT
DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate
SOURCES SOURCES
qmldocumentparser-test.cpp qmldocumentparser-test.cpp
@@ -19,7 +19,7 @@ extend_qtc_test(unittest
) )
extend_qtc_test(unittest extend_qtc_test(unittest
CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND IS_SUPPORTED_PROJECTSTORAGE_QT CONDITION IS_SUPPORTED_PROJECTSTORAGE_QT
SOURCES_PREFIX "${QML_DESIGNER_DIRECTORY}/libs/designercore" SOURCES_PREFIX "${QML_DESIGNER_DIRECTORY}/libs/designercore"
DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate
DEFINES QDS_BUILD_QMLPARSER QML_DOM_MSVC2019_COMPAT # QML_DOM_MSVC2019_COMPAT can be revmoved for Qt 6.8 DEFINES QDS_BUILD_QMLPARSER QML_DOM_MSVC2019_COMPAT # QML_DOM_MSVC2019_COMPAT can be revmoved for Qt 6.8