diff options
| author | Tomasz Olszak <olszak.tomasz@gmail.com> | 2015-02-26 15:41:36 +0100 |
|---|---|---|
| committer | Tomasz Olszak <olszak.tomasz@gmail.com> | 2015-02-26 15:41:36 +0100 |
| commit | dbcea222e3f4b661c375719796195337baa3b9a4 (patch) | |
| tree | df5d49c5bd5f45d06bc015d627f9264ef9a3456b | |
| parent | f92494471b41bdbe66532ed5837e1e825671a3a7 (diff) | |
xcb: Added handling of XCB_STATIC_LINK qmake variable.
This makes it possible to link xcb platform plugin statically with
libxcb. Such plugin will be bundled in Tizen application package because
Tizen compliance policy does not allow to link to system libxcb (it
supposed to be replaced by wayland in the future).
Change-Id: Iaf66cf2b4a04a32e1fd653bcb9eb7c0d915a3981
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
| -rw-r--r-- | config.tests/qpa/xcb/xcb.pro | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb-plugin.pro | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config.tests/qpa/xcb/xcb.pro b/config.tests/qpa/xcb/xcb.pro index a48fdbd15f..3d86c83703 100644 --- a/config.tests/qpa/xcb/xcb.pro +++ b/config.tests/qpa/xcb/xcb.pro @@ -3,3 +3,4 @@ CONFIG -= qt LIBS += -lxcb +!isEmpty(XCB_STATIC_LINK): LIBS += -lXau diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro index 129076c916..477a3711fb 100644 --- a/src/plugins/platforms/xcb/xcb-plugin.pro +++ b/src/plugins/platforms/xcb/xcb-plugin.pro @@ -106,6 +106,7 @@ contains(QT_CONFIG, xcb-qt) { XCB_DIR = ../../../3rdparty/xcb INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static + !isEmpty(XCB_STATIC_LINK): LIBS += -lXau } else { 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 |