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>

diff --git a/config.tests/qpa/xcb/xcb.pro b/config.tests/qpa/xcb/xcb.pro
index a48fdbd15f2b6de7eb0441d00a8820f3e49f3f56..3d86c837039fe982b3a8a758bae80fceb5e15bf5 100644 (file)
--- 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 129076c916226ada2029eb59a29a4c93d5d205b3..477a3711fb8a3b3bc76c7d50436d595c59a55670 100644 (file)
--- 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