1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usage of QT_NO_SHAPE

Browse Source 
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>
This commit is contained in:
Gatis Paeglis 2014-03-06 18:53:39 +01:00 committed by The Qt Project
parent f0257cc1fd
commit e9ce4fcffa
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -5231,7 +5231,7 @@ if [ "$CFG_XCB" != "no" ]; then
CFG_XCB="system" CFG_XCB="system"
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then 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_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`"
QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`" QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`"
# for xcb-xkb tests # for xcb-xkb tests

8
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -64,9 +64,7 @@
#include <xcb/xcb_icccm.h> #include <xcb/xcb_icccm.h>
#undef class #undef class
#include <xcb/xfixes.h> #include <xcb/xfixes.h>
#ifndef QT_NO_SHAPE #include <xcb/shape.h>
# include <xcb/shape.h>
#endif // QT_NO_SHAPE
// xcb-icccm 3.8 support // xcb-icccm 3.8 support
#ifdef XCB_ICCCM_NUM_WM_SIZE_HINTS_ELEMENTS #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) static inline xcb_rectangle_t qRectToXCBRectangle(const QRect &r)
{ {
xcb_rectangle_t result; xcb_rectangle_t result;
@ -2123,8 +2119,6 @@ void QXcbWindow::setMask(const QRegion &region)
} }
} }
#endif // !QT_NO_SHAPE
void QXcbWindow::setAlertState(bool enabled) void QXcbWindow::setAlertState(bool enabled)
{ {
if (m_alertState == enabled) if (m_alertState == enabled)

3
src/plugins/platforms/xcb/qxcbwindow.h
View File

@ -114,10 +114,7 @@ public:
bool startSystemResize(const QPoint &pos, Qt::Corner corner); bool startSystemResize(const QPoint &pos, Qt::Corner corner);
void setOpacity(qreal level); void setOpacity(qreal level);
#if !defined(QT_NO_SHAPE)
void setMask(const QRegion &region); void setMask(const QRegion &region);
#endif // !QT_NO_SHAPE
void setAlertState(bool enabled); void setAlertState(bool enabled);
bool isAlertState() const { return m_alertState; } bool isAlertState() const { return m_alertState; }

3
src/plugins/platforms/xcb/xcb-plugin.pro
View File

@ -121,8 +121,7 @@ contains(QT_CONFIG, xcb-qt) {
INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude
LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static
} else { } else {
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape
!contains(DEFINES, QT_NO_SHAPE):LIBS += -lxcb-shape
contains(DEFINES, QT_NO_XKB) { contains(DEFINES, QT_NO_XKB) {
LIBS += -lxcb-keysyms LIBS += -lxcb-keysyms
} else { } else {