Skip to content

Commit a3063fa

Browse files
deepin-ci-robot18202781743
authored andcommitted
sync: from linuxdeepin/qt5integration
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#284
1 parent d46c922 commit a3063fa

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ option(ENABLE_COV "Enable code coverage" OFF)
2121
if(PROJECT_VERSION_MAJOR EQUAL 6)
2222
set(VERSION_SUFFIX 6)
2323
find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
24+
if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
25+
find_package(Qt6 COMPONENTS CorePrivate GuiPrivate WidgetsPrivate REQUIRED)
26+
endif()
2427
else()
2528
set(VERSION_SUFFIX)
2629
find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core)

platformthemeplugin/qdeepintheme.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77

88
#include <QMimeDatabase>
99

10+
#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
11+
#include <private/qgenericunixtheme_p.h>
12+
#else
1013
#include <private/qgenericunixthemes_p.h>
14+
#endif
1115
#include <qpa/qplatformwindow.h>
1216
#include <qpa/qplatformnativeinterface.h>
1317

0 commit comments

Comments
 (0)