diff options
| author | Rafael Roquetto <rafael.roquetto@kdab.com> | 2014-05-29 19:20:17 -0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-02 20:12:18 +0200 |
| commit | 69e2d3b3e96bb1fa553acb5cd867267d1596c314 (patch) | |
| tree | 6d89ff9eaef095513b88bc33dd591e65a79ccb0b /src/plugins | |
| parent | 6bd8c3742e111301481d3658a7c0a970bb10d66b (diff) | |
QNX: Fix compilation when OpenGL is not available
Change-Id: I67a1d095fc3efd58e9520c9cb3fad13e04a4d64f
Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com>
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxnativeinterface.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxnativeinterface.h | 3 |
2 files changed, 11 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) { diff --git a/src/plugins/platforms/qnx/qqnxnativeinterface.h b/src/plugins/platforms/qnx/qqnxnativeinterface.h index 83900791f6..41e6105f84 100644 --- a/src/plugins/platforms/qnx/qqnxnativeinterface.h +++ b/src/plugins/platforms/qnx/qqnxnativeinterface.h @@ -56,7 +56,10 @@ public: void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen); void *nativeResourceForIntegration(const QByteArray &resource); +#if !defined(QT_NO_OPENGL) void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context); +#endif + void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value); NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource); |