diff options
| author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-07-31 18:12:18 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 15:37:46 +0200 |
| commit | 89a1a943cecc2a8d39c88d64bcbee6cf5e02519e (patch) | |
| tree | 19c197d8cce71790fd105369ef45450811acef03 /src/plugins/platforms/qnx/qqnxintegration.cpp | |
| parent | 3a2bc9530e1ace629c37c708e0f0f1b2ca3ed05c (diff) | |
QNX: Remove dependency on QtWidgets from QNX QPA plugin
Change-Id: I52027752630beee81a97644983dbccf973c0c2c2
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxintegration.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp index 391a17be27..6d0c2000f8 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.cpp +++ b/src/plugins/platforms/qnx/qqnxintegration.cpp @@ -84,9 +84,7 @@ #include <QtGui/qwindowsysteminterface.h> #if !defined(QT_NO_OPENGL) -#include "qqnxglbackingstore.h" #include "qqnxglcontext.h" - #include <QtGui/QOpenGLContext> #endif @@ -117,9 +115,6 @@ QQnxIntegration::QQnxIntegration() #endif , m_services(0) , m_fontDatabase(new QGenericUnixFontDatabase()) -#if !defined(QT_NO_OPENGL) - , m_paintUsingOpenGL(false) -#endif #if defined(Q_OS_BLACKBERRY) , m_eventDispatcher(new QQnxEventDispatcherBlackberry()) , m_bpsEventFilter(0) @@ -301,12 +296,7 @@ QPlatformWindow *QQnxIntegration::createPlatformWindow(QWindow *window) const QPlatformBackingStore *QQnxIntegration::createPlatformBackingStore(QWindow *window) const { qIntegrationDebug() << Q_FUNC_INFO; -#if !defined(QT_NO_OPENGL) - if (paintUsingOpenGL()) - return new QQnxGLBackingStore(window); - else -#endif - return new QQnxRasterBackingStore(window); + return new QQnxRasterBackingStore(window); } #if !defined(QT_NO_OPENGL) |