blob: 3461b8934315d9904e70a420cde30dbd15996ba1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
diff -ru fcitx-qt5-1.2.7.orig/qt6/CMakeLists.txt fcitx-qt5-1.2.7/qt6/CMakeLists.txt
--- fcitx-qt5-1.2.7.orig/qt6/CMakeLists.txt 2025-10-04 22:05:57.986046767 +0200
+++ fcitx-qt5-1.2.7/qt6/CMakeLists.txt 2025-10-04 22:46:01.206070087 +0200
@@ -1,5 +1,9 @@
find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core DBus)
-find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private)
+if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
+ find_package(Qt6 COMPONENTS GuiPrivate REQUIRED)
+else()
+ find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private)
+endif()
add_definitions(-DQT_NO_KEYWORDS)
diff -ru fcitx-qt5-1.2.7.orig/qt6/platforminputcontext/CMakeLists.txt fcitx-qt5-1.2.7/qt6/platforminputcontext/CMakeLists.txt
--- fcitx-qt5-1.2.7.orig/qt6/platforminputcontext/CMakeLists.txt 2025-10-04 22:05:57.986046767 +0200
+++ fcitx-qt5-1.2.7/qt6/platforminputcontext/CMakeLists.txt 2025-10-05 10:18:04.051013755 +0200
@@ -1,5 +1,8 @@
-include_directories(${Qt6Gui_PRIVATE_INCLUDE_DIRS})
-
+if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
+ include_directories(${Qt6GuiPrivate_INCLUDE_DIRS})
+else()
+ include_directories(${Qt6Gui_PRIVATE_INCLUDE_DIRS})
+endif()
set(plugin_SRCS
fcitxinputcontextproxy.cpp
@@ -36,6 +39,7 @@
target_link_libraries(fcitxplatforminputcontextplugin-qt6
Qt6::Core
Qt6::Gui
+ Qt6::GuiPrivate
Qt6::DBus
XKBCommon::XKBCommon
)
|