AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNX: Fix compilation when OpenGL is not available

Browse Source 
Change-Id: I67a1d095fc3efd58e9520c9cb3fad13e04a4d64f
Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com>
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
This commit is contained in:
Rafael Roquetto 2014-05-29 19:20:17 -03:00 committed by The Qt Project
parent 6bd8c3742e
commit 69e2d3b3e9
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/qnx/qqnxnativeinterface.cpp
View File

@ -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)
{

3
src/plugins/platforms/qnx/qqnxnativeinterface.h
View File

@ -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);