diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-11-15 15:18:25 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-11-22 13:12:47 (GMT) |
| commit | 687d44569dbccea72c582c6d7da9a271ae2c86c8 (patch) | |
| tree | c20aa5e504e8fbbf85068be824053a30eea2e025 /src/gui/kernel/qwidget_qpa.cpp | |
| parent | c5a085cb82a9b8e91e37575e19014b60dd2e4216 (diff) | |
| download | Qt-687d44569dbccea72c582c6d7da9a271ae2c86c8.zip Qt-687d44569dbccea72c582c6d7da9a271ae2c86c8.tar.gz Qt-687d44569dbccea72c582c6d7da9a271ae2c86c8.tar.bz2 | |
No more windowsurface for QGLWidget in Lighthouse
Reviewed-by: paul
Diffstat (limited to 'src/gui/kernel/qwidget_qpa.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_qpa.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_qpa.cpp b/src/gui/kernel/qwidget_qpa.cpp index ac8b37d..aff959e 100644 --- a/src/gui/kernel/qwidget_qpa.cpp +++ b/src/gui/kernel/qwidget_qpa.cpp @@ -97,7 +97,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO } Q_ASSERT(platformWindow); - if (!surface) { + if (!surface && platformWindow && q->platformWindowFormat().hasWindowSurface()) { surface = QApplicationPrivate::platformIntegration()->createWindowSurface(q,platformWindow->winId()); } @@ -831,7 +831,10 @@ QPaintEngine *QWidget::paintEngine() const QWindowSurface *QWidgetPrivate::createDefaultWindowSurface_sys() { Q_Q(QWidget); - return QApplicationPrivate::platformIntegration()->createWindowSurface(q,0); + if (q->platformWindowFormat().hasWindowSurface()) + return QApplicationPrivate::platformIntegration()->createWindowSurface(q,0); + else + return 0; } void QWidgetPrivate::setModal_sys() |