diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-29 06:49:11 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-29 06:49:11 (GMT) |
| commit | ff6c8f9439630c2ea3bf78d5568a44521e915898 (patch) | |
| tree | ff3fc149ebc6547dda412500aadeacbe568e2ceb /src/gui/kernel/qwidget.cpp | |
| parent | 6034fc5b4a15bab2ab65e4cc3963fe00bdcb415b (diff) | |
| parent | fd5269a9a80bf8b119086b3f326c72a332aba4e9 (diff) | |
| download | Qt-ff6c8f9439630c2ea3bf78d5568a44521e915898.zip Qt-ff6c8f9439630c2ea3bf78d5568a44521e915898.tar.gz Qt-ff6c8f9439630c2ea3bf78d5568a44521e915898.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -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) |