diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-09-28 10:09:02 (GMT) |
|---|---|---|
| committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-09-28 11:11:58 (GMT) |
| commit | 9021dd294b4d998192ed9b06ce86be6ed8ffddf2 (patch) | |
| tree | 7f32bc8f33e83642f4193fac3ef906962dfd2384 /src | |
| parent | 76494c76c482edfe89639491317d008ea3e2a9d0 (diff) | |
| download | Qt-9021dd294b4d998192ed9b06ce86be6ed8ffddf2.zip Qt-9021dd294b4d998192ed9b06ce86be6ed8ffddf2.tar.gz Qt-9021dd294b4d998192ed9b06ce86be6ed8ffddf2.tar.bz2 | |
Fixed unwanted recursion when calling openGLVersionFlags().
Reviewed-by: Gunnar
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 53ef682..2397793 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -10145,7 +10145,8 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) "QWidgetPrivate::high_attributes[] too small to contain all attributes in WidgetAttribute"); #ifdef Q_WS_WIN - if (attribute == Qt::WA_PaintOnScreen && on) { + // ### Don't use PaintOnScreen+paintEngine() to do native painting in 5.0 + if (attribute == Qt::WA_PaintOnScreen && on && !inherits("QGLWidget")) { // see qwidget_win.cpp, ::paintEngine for details paintEngine(); if (d->noPaintOnScreen) |