diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-02-22 14:33:56 +0300 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-07-03 11:40:35 +0000 |
| commit | 46312b611b4aa04d32eab05668d84f09e6aa6670 (patch) | |
| tree | 382c92a2ae4958ece7221ce9c82726be4dd88130 /src/plugins/platforms/xcb/qxcbintegration.h | |
| parent | 5ac03a14bfeab468e4d1676d31c611d8c03b1129 (diff) | |
xcb: Use QT_CONFIG macro to check for xcb-sm, xcb-render, and xcb-glx
And remove the corresponding defines.
Note that XCB_USE_GLX and XCB_HAS_XCB_GLX were used as synonyms
because QGLXBufferSwapComplete was wrapped in #if defined(XCB_USE_GLX)
and at the same time it was used only when XCB_HAS_XCB_GLX
was defined.
Change-Id: I6c04b0ccfd5369b78b3e8af2ec39d38ae5c311dc
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbintegration.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h index baa5c9d835..b3d72c19d0 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.h +++ b/src/plugins/platforms/xcb/qxcbintegration.h @@ -40,6 +40,7 @@ #ifndef QXCBINTEGRATION_H #define QXCBINTEGRATION_H +#include <QtGui/private/qtguiglobal_p.h> #include <qpa/qplatformintegration.h> #include <qpa/qplatformscreen.h> @@ -105,7 +106,7 @@ public: QByteArray wmClass() const; -#if !defined(QT_NO_SESSIONMANAGER) && defined(XCB_USE_SM) +#if QT_CONFIG(xcb_sm) QPlatformSessionManager *createPlatformSessionManager(const QString &id, const QString &key) const override; #endif |