Skip to content

Commit 964171d

Browse files
authored
Add .5.1 suffix to Qt6 input context plugin IID and Fix repo (#736)
* Fix opensuse repo as default * Add .5.1 suffix to Qt6 input context plugin IID
1 parent 59bd3de commit 964171d

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

README.ko.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@ emaint sync -r riey
8383
emerge -av kime
8484
```
8585

86-
### 오픈수세
86+
### 오픈수세 (텀블위드)
8787

8888
```
89-
zypper ar https://download.opensuse.org/repositories/home:/Kernalix7/openSUSE_Tumbleweed/home:Kernalix7.repo
90-
zypper refresh
9189
zypper in kime
9290
```
9391

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,9 @@ emaint sync -r riey
8585
emerge -av kime
8686
```
8787

88-
### openSUSE
88+
### openSUSE (Tumbleweed)
8989

9090
```
91-
zypper ar https://download.opensuse.org/repositories/home:/Kernalix7/openSUSE_Tumbleweed/home:Kernalix7.repo
92-
zypper refresh
9391
zypper in kime
9492
```
9593

src/frontends/qt5/src/plugin.hpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
#include <QtPlugin>
77
#include <qpa/qplatforminputcontextplugin_p.h>
88

9+
#ifndef KIME_QT_IID
10+
#define KIME_QT_IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface"
11+
#endif
12+
913
class KimePlatformInputContextPlugin : public QPlatformInputContextPlugin {
1014
Q_OBJECT
11-
Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE
12-
"kime.json")
15+
Q_PLUGIN_METADATA(IID KIME_QT_IID FILE "kime.json")
1316

1417
private:
1518
kime::InputEngine *engine = nullptr;
@@ -21,4 +24,4 @@ class KimePlatformInputContextPlugin : public QPlatformInputContextPlugin {
2124

2225
QPlatformInputContext *create(const QString &key,
2326
const QStringList &param_list) override;
24-
};
27+
};

src/frontends/qt6/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(CMAKE_AUTOMOC ON)
44
set(CMAKE_AUTORCC ON)
55
set(CMAKE_AUTOUIC ON)
66

7-
find_package(Qt6 6.0.0 QUIET COMPONENTS Gui QUIET)
7+
find_package(Qt6 6.0.0 QUIET COMPONENTS Gui GuiPrivate QUIET)
88
find_package(Qt5 5.1.0 QUIET COMPONENTS Gui QUIET)
99

1010
if(NOT Qt6_FOUND)
@@ -13,6 +13,7 @@ endif()
1313

1414
add_library(kime-qt6 SHARED ../qt5/src/plugin.cc ../qt5/src/input_context.cc)
1515

16-
target_include_directories(kime-qt6 PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS} ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${KIME_INCLUDE})
16+
target_compile_definitions(kime-qt6 PRIVATE KIME_QT_IID="org.qt-project.Qt.QPlatformInputContextFactoryInterface.5.1")
17+
target_include_directories(kime-qt6 PRIVATE ${KIME_INCLUDE})
1718
target_link_directories(kime-qt6 PRIVATE ${KIME_LIB_DIRS})
18-
target_link_libraries(kime-qt6 PRIVATE ${KIME_ENGINE} Qt6::Gui)
19+
target_link_libraries(kime-qt6 PRIVATE ${KIME_ENGINE} Qt6::Gui Qt6::GuiPrivate)

0 commit comments

Comments
 (0)