summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2012-07-09 11:20:19 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-09 11:54:49 +0200
commit4d32eab75977b29cc0f532430cd2a250cebfa895 (patch)
treeaa11fdca1c5d98805c7f3a5a976e0c2a44d71a9e /src/widgets
parent6fef496cd62a33200b2106a0e4d618489a1facfc (diff)
fix "paintEngine: Should no longer be called" warnings on Windows
Change-Id: Idece743d1f28f1c579d823123b6814fae786b58b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/kernel/qwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 4b55e3cab3..8ef823c41b 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -9948,7 +9948,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
"QWidgetPrivate::high_attributes[] too small to contain all attributes in WidgetAttribute");
#ifdef Q_OS_WIN
// ### Don't use PaintOnScreen+paintEngine() to do native painting in some future release
- if (attribute == Qt::WA_PaintOnScreen && on && !inherits("QGLWidget")) {
+ if (attribute == Qt::WA_PaintOnScreen && on && windowType() != Qt::Desktop && !inherits("QGLWidget")) {
// see qwidget_qpa.cpp, ::paintEngine for details
paintEngine();
if (d->noPaintOnScreen)