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
|
From: =?utf-8?b?IkNoYW5nWmh1byBDaGVuICjpmbPmmIzlgKwpIg==?=
<czchen@debian.org>
Date: Sat, 3 Dec 2016 01:54:45 +0800
Subject: Use QPlatformInputContextFactoryInterface_iid
---
qt5-im/Makefile | 2 +-
qt5-im/gcin-qt5.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/qt5-im/Makefile b/qt5-im/Makefile
index 4993086..c06efae 100644
--- a/qt5-im/Makefile
+++ b/qt5-im/Makefile
@@ -23,7 +23,7 @@ all: $(GCIN_QT5)
$(CXX) -E $(CFLAGS) $(INCS) $< > $@
moc_gcin-qt5.cpp: gcin-qt5.h
- $(QT5_MOC) $< -o $@
+ $(QT5_MOC) $(INCS) $< -o $@
moc_qgcinplatforminputcontext.cpp: qgcinplatforminputcontext.h
$(QT5_MOC) $< -o $@
diff --git a/qt5-im/gcin-qt5.h b/qt5-im/gcin-qt5.h
index 0f958af..a72ea76 100644
--- a/qt5-im/gcin-qt5.h
+++ b/qt5-im/gcin-qt5.h
@@ -9,7 +9,7 @@ class QGcinPlatformInputContextPlugin : public QPlatformInputContextPlugin
{
Q_OBJECT
public:
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface.5.1" FILE "gcin.json")
+ Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "gcin.json")
QStringList keys() const;
QGcinPlatformInputContext *create(const QString& system, const QStringList& paramList);
};
|
