diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2012-10-05 20:31:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 08:45:22 +0200 |
| commit | 3d52d67096b0b3a427c085e5d84bcf13d16c1086 (patch) | |
| tree | e92bdeda6f0c6ec317bcd66abc71c6c17eb7f334 /src/plugins/platforms/xcb/qxcbintegration.cpp | |
| parent | 267b1a791d9527fed34c44c53440298331224542 (diff) | |
Compile fix for when XCB_USE_GLX is not defined.
Fixes compile failure introduced by 394249616cbb4c0861a032d33f846f.
Change-Id: I5794d22ee87eb18c08ea1de227b943f2e675356c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 029a6de17f..2ace68036b 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -119,7 +119,9 @@ QXcbIntegration::QXcbIntegration(const QStringList ¶meters) QXcbIntegration::~QXcbIntegration() { +#if !defined(QT_NO_OPENGL) && defined(XCB_USE_GLX) qDeleteAll(m_defaultContextInfos); +#endif qDeleteAll(m_connections); } @@ -289,10 +291,14 @@ QPlatformTheme *QXcbIntegration::createPlatformTheme(const QString &name) const */ void QXcbIntegration::removeDefaultOpenGLContextInfo(QXcbScreen *screen) { +#if !defined(QT_NO_OPENGL) && defined(XCB_USE_GLX) if (!m_defaultContextInfos.contains(screen)) return; QOpenGLDefaultContextInfo* info = m_defaultContextInfos.take(screen); delete info; +#else + Q_UNUSED(screen); +#endif } QT_END_NAMESPACE |