diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-07-03 12:19:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 13:31:20 +0200 |
| commit | 3037525530fa47c35cdcb492bf3e42d36e85e6c3 (patch) | |
| tree | 3675db05e4bbda1e39090ee9068a0d2f42757050 /src/widgets/kernel/qwidget_p.h | |
| parent | 8ccab9b029ed2a2444d89a9cfc6c4a1866b8e82d (diff) | |
revive the noPaintOnScreen fix on Windows
The original commit message follows.
Fixes: Fix the windows PaintOnScreen issue once and for all
Details: To allow both the case where X11 people accidentally set
PaintOnScreen (which should not have any effect on windows)
and where people set it and subclass with paintEngine() {
return 0 } to use GDI / DirectX we do this rather nasty hack.
Original commit in Qt4: 07a2f68bd5869152471e4ffc4a63c683ef141ae8
Autotest: tst_QWidget::paintOnScreenPossible
Change-Id: Ifbb7dc4611959be3ecc362c29a1c3436b0e0fa82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget_p.h')
| -rw-r--r-- | src/widgets/kernel/qwidget_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 9036b7a848..75d03f87af 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -694,6 +694,9 @@ public: #endif // *************************** Platform specific ************************************ +#if defined(Q_OS_WIN) + uint noPaintOnScreen : 1; // see qwidget_qpa.cpp ::paintEngine() +#endif #if defined(Q_WS_X11) // <----------------------------------------------------------- X11 Qt::HANDLE picture; static QWidget *mouseGrabber; @@ -708,7 +711,6 @@ public: QPoint mapToGlobal(const QPoint &pos) const; QPoint mapFromGlobal(const QPoint &pos) const; #elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN - uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine() #ifndef QT_NO_GESTURES uint nativeGesturePanEnabled : 1; #endif |