whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile fix for when XCB_USE_GLX is not defined. 

Fixes compile failure introduced by 394249616c.

Change-Id: I5794d22ee87eb18c08ea1de227b943f2e675356c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Samuel Rødal 2012-10-05 20:31:21 +02:00 committed by The Qt Project
parent 267b1a791d
commit 3d52d67096
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/xcb/qxcbintegration.cpp
View File

@ -119,7 +119,9 @@ QXcbIntegration::QXcbIntegration(const QStringList &parameters)
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

4
src/plugins/platforms/xcb/qxcbintegration.h
View File

@ -50,10 +50,10 @@ QT_BEGIN_NAMESPACE
class QXcbConnection;
class QAbstractEventDispatcher;
class QXcbNativeInterface;
class QXcbScreen;
#if !defined(QT_NO_OPENGL) && defined(XCB_USE_GLX)
class QOpenGLDefaultContextInfo;
class QXcbScreen;
#endif
class QXcbIntegration : public QPlatformIntegration
@ -97,9 +97,7 @@ public:
QStringList themeNames() const;
QPlatformTheme *createPlatformTheme(const QString &name) const;
#if !defined(QT_NO_OPENGL) && defined(XCB_USE_GLX)
void removeDefaultOpenGLContextInfo(QXcbScreen *screen);
#endif
private:
QList<QXcbConnection *> m_connections;