diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
| commit | dfc177e3a99dd593db4b1e9445d6243ce75ebf07 (patch) | |
| tree | 4e33c7be90a44642e672fff22ea163b500ff3aef /src/plugins/platforminputcontexts/compose/compose.pro | |
| parent | 72efb2e6f4af2fd909daaf9104f09fd1425acfb0 (diff) | |
| parent | 1d6eb70dcec105af28d6a5e9b59d56c895c70389 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
qmake/library/qmakeevaluator.cpp
(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
src/corelib/kernel/qcore_mac_objc.mm
src/gui/painting/qcolor.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31
Diffstat (limited to 'src/plugins/platforminputcontexts/compose/compose.pro')
| -rw-r--r-- | src/plugins/platforminputcontexts/compose/compose.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro index 17284874f6..2f53c5b416 100644 --- a/src/plugins/platforminputcontexts/compose/compose.pro +++ b/src/plugins/platforminputcontexts/compose/compose.pro @@ -2,8 +2,6 @@ TARGET = composeplatforminputcontextplugin QT += core-private gui-private -DEFINES += X11_PREFIX='\\"$$QMAKE_X11_PREFIX\\"' - SOURCES += $$PWD/qcomposeplatforminputcontextmain.cpp \ $$PWD/qcomposeplatforminputcontext.cpp \ $$PWD/generator/qtablegenerator.cpp \ @@ -18,6 +16,10 @@ HEADERS += $$PWD/qcomposeplatforminputcontext.h \ QMAKE_USE += xkbcommon } +include($$OUT_PWD/../../../gui/qtgui-config.pri) + +DEFINES += X11_PREFIX='\\"$$QMAKE_X11_PREFIX\\"' + OTHER_FILES += $$PWD/compose.json PLUGIN_TYPE = platforminputcontexts |