From 04c8ba5b3f2064843a7fce7c1c1c3eb4bc98d959 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 6 Aug 2024 14:24:58 +0200 Subject: [PATCH] QmlDesigner: Fix linking for Qt6::QmlDomPrivate Depends on fix in Qt 6.7.3. Change-Id: I6e88ff660b6bf0ed7629cd58d62cc76d8a3f3cef Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/CMakeLists.txt | 1 + tests/unit/tests/unittests/projectstorage/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index d46dd38fe0f..fe3a5d00f97 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -458,6 +458,7 @@ extend_qtc_library(QmlDesignerCore SOURCES_PREFIX designercore/projectstorage PUBLIC_INCLUDES designercore/projectstorage SOURCES_PROPERTIES SKIP_AUTOGEN ON + DEFINES QML_DOM_MSVC2019_COMPAT # can be removed for Qt 6.8 SOURCES commontypecache.h directorypathcompressor.h diff --git a/tests/unit/tests/unittests/projectstorage/CMakeLists.txt b/tests/unit/tests/unittests/projectstorage/CMakeLists.txt index ef5d7290ada..2f7aaccf7a3 100644 --- a/tests/unit/tests/unittests/projectstorage/CMakeLists.txt +++ b/tests/unit/tests/unittests/projectstorage/CMakeLists.txt @@ -26,7 +26,7 @@ extend_qtc_test(unittest CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND IS_SUPPORTED_PROJECTSTORAGE_QT SOURCES_PREFIX "${QmlDesignerDir}/designercore" DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate - DEFINES QDS_BUILD_QMLPARSER + DEFINES QDS_BUILD_QMLPARSER QML_DOM_MSVC2019_COMPAT # QML_DOM_MSVC2019_COMPAT can be revmoved for Qt 6.8 SOURCES projectstorage/qmldocumentparser.cpp projectstorage/qmldocumentparser.h projectstorage/qmltypesparser.cpp projectstorage/qmltypesparser.h