diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-07 00:40:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-07 00:40:44 +0200 |
| commit | d9a7ad80f78e7346d6f4dbae2cabe31305d6458f (patch) | |
| tree | 26a410780b94c553051b8898d5abaf37a909691b /src/plugins/platforms/qnx/qqnxnativeinterface.cpp | |
| parent | d707acfc9e357ffc86feb5d9219372c30c5ff157 (diff) | |
| parent | 0fcce50af009f97efa2a5c5f2c74415c92830962 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxnativeinterface.cpp')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxnativeinterface.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/qnx/qqnxnativeinterface.cpp b/src/plugins/platforms/qnx/qqnxnativeinterface.cpp index a245a0c43a..05504f8bf4 100644 --- a/src/plugins/platforms/qnx/qqnxnativeinterface.cpp +++ b/src/plugins/platforms/qnx/qqnxnativeinterface.cpp @@ -41,7 +41,10 @@ #include "qqnxnativeinterface.h" +#if !defined(QT_NO_OPENGL) #include "qqnxglcontext.h" +#endif + #include "qqnxscreen.h" #include "qqnxwindow.h" #if defined(QQNX_IMF) @@ -50,7 +53,10 @@ #include "qqnxintegration.h" +#if !defined(QT_NO_OPENGL) #include <QtGui/QOpenGLContext> +#endif + #include <QtGui/QScreen> #include <QtGui/QWindow> @@ -95,6 +101,7 @@ void *QQnxNativeInterface::nativeResourceForIntegration(const QByteArray &resour return 0; } +#if !defined(QT_NO_OPENGL) void *QQnxNativeInterface::nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) { if (resource == "eglcontext" && context) @@ -102,6 +109,7 @@ void *QQnxNativeInterface::nativeResourceForContext(const QByteArray &resource, return 0; } +#endif void QQnxNativeInterface::setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value) { |