diff options
| author | Stephen Kelly <stephen.kelly.qnx@kdab.com> | 2012-04-18 15:07:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 17:04:04 +0200 |
| commit | d21f8c157a0726b6f365866d023bab9525f93f4d (patch) | |
| tree | f1a1bed12d52fe6d7e132e6d018b516938be9e4e /src/plugins/platforms/qnx/qqnxwindow.cpp | |
| parent | 61c433785eb918d81b927f17bcad4687f2269afe (diff) | |
Build the QNX plugin with -no-opengl enabled.
Change-Id: I776a3eb0d7ada4399b8c191bbfa1e3ed9236b20e
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxwindow.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index 85c3e495f8..e37c82740c 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -40,7 +40,9 @@ ****************************************************************************/ #include "qqnxwindow.h" +#ifndef QT_NO_OPENGL #include "qqnxglcontext.h" +#endif #include "qqnxintegration.h" #include "qqnxscreen.h" @@ -59,7 +61,9 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context) m_window(0), m_currentBufferIndex(-1), m_previousBufferIndex(-1), +#ifndef QT_NO_OPENGL m_platformOpenGLContext(0), +#endif m_screen(0), m_parentWindow(0), m_visible(true) @@ -301,6 +305,7 @@ void QQnxWindow::setBufferSize(const QSize &size) // Create window buffers if they do not exist if (!hasBuffers()) { +#ifndef QT_NO_OPENGL // Get pixel format from EGL config if using OpenGL; // otherwise inherit pixel format of window's screen if (m_platformOpenGLContext != 0) { @@ -308,6 +313,7 @@ void QQnxWindow::setBufferSize(const QSize &size) } else { val[0] = m_screen->nativeFormat(); } +#endif errno = 0; result = screen_set_window_property_iv(m_window, SCREEN_PROPERTY_FORMAT, val); @@ -553,12 +559,14 @@ void QQnxWindow::gainedFocus() QWindowSystemInterface::handleWindowActivated(window()); } +#ifndef QT_NO_OPENGL void QQnxWindow::setPlatformOpenGLContext(QQnxGLContext *platformOpenGLContext) { // This function does not take ownership of the platform gl context. // It is owned by the frontend QOpenGLContext m_platformOpenGLContext = platformOpenGLContext; } +#endif QQnxWindow *QQnxWindow::findWindow(screen_window_t windowHandle) { |