diff options
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
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 ®ion) } } -#endif // !QT_NO_SHAPE - void QXcbWindow::setAlertState(bool enabled) { if (m_alertState == enabled) |