QPlatformWindow: Add Window masks.

[profile/ivi/qtbase.git] / src / plugins / platforms / xcb / xcb.pro

diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro
index 143a671..8e6fbc6 100644 (file)
--- a/src/plugins/platforms/xcb/xcb.pro
+++ b/src/plugins/platforms/xcb/xcb.pro
@@ -5,6 +5,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
 QT += core-private gui-private platformsupport-private
 
+
 SOURCES = \
         qxcbclipboard.cpp \
         qxcbconnection.cpp \
@@ -44,7 +45,18 @@ contains(QT_CONFIG, xcb-poll-for-queued-event) {
 # needed by GLX, Xcursor, XLookupString, ...
 contains(QT_CONFIG, xcb-xlib) {
     DEFINES += XCB_USE_XLIB
+    !contains(DEFINES, QT_NO_SHAPE):LIBS += -lXext
     LIBS += -lX11 -lX11-xcb
+
+    linux-g++-maemo {
+        contains(QT_CONFIG, xinput2) {
+            # XInput2 support for Harmattan.
+            DEFINES += XCB_USE_XINPUT2_MAEMO
+            SOURCES += qxcbconnection_maemo.cpp
+            LIBS += -lXi
+        }
+        DEFINES += XCB_USE_MAEMO_WINDOW_PROPERTIES
+    }
 }
 
 # to support custom cursors with depth > 1
@@ -63,19 +75,24 @@ contains(DEFINES, XCB_USE_DRI2) {
     HEADERS += qdri2context.h
     SOURCES += qdri2context.cpp
 
-} else {
+} else:contains(QT_CONFIG, opengl) {
     contains(QT_CONFIG, opengles2) {
         DEFINES += XCB_USE_EGL
         LIBS += -lEGL
         HEADERS += qxcbeglsurface.h
+
+        # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType
+        # and other types to the correct X11 types
+        DEFINES += SUPPORT_X11
     } else:contains(QT_CONFIG, xcb-xlib) {
         DEFINES += XCB_USE_GLX
         HEADERS += qglxintegration.h
         SOURCES += qglxintegration.cpp
+        LIBS += $$QMAKE_LIBS_DYNLOAD
     }
 }
 
-LIBS += -lxcb -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-sync -lxcb-xfixes
+LIBS += -lxcb -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shape -lxcb-shm -lxcb-randr
 
 DEFINES += $$QMAKE_DEFINES_XCB
 LIBS += $$QMAKE_LIBS_XCB
@@ -89,5 +106,7 @@ QT += dbus
 LIBS += -ldbus-1
 }
 
+OTHER_FILES += xcb.json
+
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target