summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qbackingstore_p.h
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-03-21 15:09:33 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-03-21 15:09:33 (GMT)
commitf464bef8b0d8cd30a3c795558e5a7b28635ac057 (patch)
tree01c17f782a3b79cf71656c6910432ca43d4557d5 /src/gui/painting/qbackingstore_p.h
parent0112a4ce3980bfaf5a3e45a5f77cf65700db5436 (diff)
parent86ceda033eda6bd615134f71b9850081a0c808c9 (diff)
downloadQt-f464bef8b0d8cd30a3c795558e5a7b28635ac057.zip
Qt-f464bef8b0d8cd30a3c795558e5a7b28635ac057.tar.gz
Qt-f464bef8b0d8cd30a3c795558e5a7b28635ac057.tar.bz2
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/gui/painting/qbackingstore_p.h')
-rw-r--r--src/gui/painting/qbackingstore_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qbackingstore_p.h b/src/gui/painting/qbackingstore_p.h
index e2b21c3..47387ab 100644
--- a/src/gui/painting/qbackingstore_p.h
+++ b/src/gui/painting/qbackingstore_p.h
@@ -209,8 +209,9 @@ private:
{
#ifdef Q_WS_QWS
return tlw->frameGeometry();
-#endif
+#else
return tlw->data->crect;
+#endif
}
inline void appendDirtyOnScreenWidget(QWidget *widget)