From e9ce4fcffa3459774e69f712f81a6a0a542dbcd8 Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@digia.com>
Date: Thu, 6 Mar 2014 18:53:39 +0100
Subject: [PATCH] Remove usage of QT_NO_SHAPE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

First of all QT_NO_SHAPE was never set in configure script, which
means that !contains(DEFINES, QT_NO_SHAPE):LIBS += -lxcb-shape always
was true and we were linking to -lxcb-shape no matter what.

Secondly, we are providing shape.c in qtbase/src/3rdparty/xcb/libxcb, so
users always have an -qt-xcb option available to get this extension.

Change-Id: I7d14a0ac5ca6e36fb9c053225916cae41028b532
Reviewed-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
---
 configure                                | 2 +-
 src/plugins/platforms/xcb/qxcbwindow.cpp | 8 +-------
 src/plugins/platforms/xcb/qxcbwindow.h   | 3 ---
 src/plugins/platforms/xcb/xcb-plugin.pro | 3 +--
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index 64edc1571f..0f47ff9668 100755
--- a/configure
+++ b/configure
@@ -5231,7 +5231,7 @@ if [ "$CFG_XCB" != "no" ]; then
             CFG_XCB="system"
 
             if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then
-                XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm"
+                XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape"
                 QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`"
                 QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`"
                 # for xcb-xkb tests
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 29f71e6972..aabcb84a08 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -64,9 +64,7 @@
 #include <xcb/xcb_icccm.h>
 #undef class
 #include <xcb/xfixes.h>
-#ifndef QT_NO_SHAPE
-#  include <xcb/shape.h>
-#endif // QT_NO_SHAPE
+#include <xcb/shape.h>
 
 // xcb-icccm 3.8 support
 #ifdef XCB_ICCCM_NUM_WM_SIZE_HINTS_ELEMENTS
@@ -2077,8 +2075,6 @@ void QXcbWindow::handleXEmbedMessage(const xcb_client_message_event_t *event)
     }
 }
 
-#if !defined(QT_NO_SHAPE)
-
 static inline xcb_rectangle_t qRectToXCBRectangle(const QRect &r)
 {
     xcb_rectangle_t result;
@@ -2123,8 +2119,6 @@ void QXcbWindow::setMask(const QRegion &region)
     }
 }
 
-#endif // !QT_NO_SHAPE
-
 void QXcbWindow::setAlertState(bool enabled)
 {
     if (m_alertState == enabled)
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index 45d44b213f..a90ad7b5ed 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -114,10 +114,7 @@ public:
     bool startSystemResize(const QPoint &pos, Qt::Corner corner);
 
     void setOpacity(qreal level);
-
-#if !defined(QT_NO_SHAPE)
     void setMask(const QRegion &region);
-#endif // !QT_NO_SHAPE
 
     void setAlertState(bool enabled);
     bool isAlertState() const { return m_alertState; }
diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro
index a2ae7e908c..bfbec91e3c 100644
--- a/src/plugins/platforms/xcb/xcb-plugin.pro
+++ b/src/plugins/platforms/xcb/xcb-plugin.pro
@@ -121,8 +121,7 @@ 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
-    !contains(DEFINES, QT_NO_SHAPE):LIBS += -lxcb-shape
+    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 {