diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2014-03-31 17:45:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 17:45:37 +0200 |
| commit | bd822bedfea5126b12c32523a68c3a1ac7a8931d (patch) | |
| tree | 0fafd5ac037e3b62ad45e8808989ec89155618b4 /src/plugins/platforms/xcb/xcb-plugin.pro | |
| parent | 84c10500b1730e8d947732728d190fde612fc840 (diff) | |
| parent | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/xcb/xcb-plugin.pro')
| -rw-r--r-- | src/plugins/platforms/xcb/xcb-plugin.pro | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro index bfbec91e3c..e19bb921e1 100644 --- a/src/plugins/platforms/xcb/xcb-plugin.pro +++ b/src/plugins/platforms/xcb/xcb-plugin.pro @@ -131,12 +131,9 @@ contains(QT_CONFIG, xcb-qt) { # libxkbcommon contains(QT_CONFIG, xkbcommon-qt): { + QT_CONFIG += use-xkbcommon-x11support include(../../../3rdparty/xkbcommon.pri) } else { LIBS += $$QMAKE_LIBS_XKBCOMMON QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON - equals(QMAKE_VERSION_XKBCOMMON, "0.2.0") { - DEFINES += XKBCOMMON_0_2_0 - INCLUDEPATH += ../../../3rdparty/xkbcommon/xkbcommon/ - } } |