diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:26 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:27 +0300 |
| commit | 0ab63b035a649dc1982c867cd37d466d249004b9 (patch) | |
| tree | 6de22edcd3957aae3eee698136a000e52ab7f8fe /src/plugins/platforms/xcb/xcb-plugin.pro | |
| parent | a6f8aa0ae1d5a1d1099df1891ea60b14b6eb6065 (diff) | |
| parent | 0cb2c760c219514849ab0f6be8e5368f92dfa5d9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069
Diffstat (limited to 'src/plugins/platforms/xcb/xcb-plugin.pro')
| -rw-r--r-- | src/plugins/platforms/xcb/xcb-plugin.pro | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro index e19bb921e1..9e4e997f55 100644 --- a/src/plugins/platforms/xcb/xcb-plugin.pro +++ b/src/plugins/platforms/xcb/xcb-plugin.pro @@ -121,12 +121,8 @@ contains(QT_CONFIG, xcb-qt) { INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static } else { - LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape - contains(DEFINES, QT_NO_XKB) { - LIBS += -lxcb-keysyms - } else { - LIBS += -lxcb-xkb - } + LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms + !contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb } # libxkbcommon |