diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-02 11:54:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-02 11:54:15 (GMT) |
| commit | b956e12165beb11e92f3d9b65aa488cd120ec6c8 (patch) | |
| tree | a200e811d590ecc4cc169ef65da9d9dcc9e1f1b7 /src/gui/kernel/qwidget_p.h | |
| parent | 0fd09af3a05ac88c55fed73c85dc1c5aba68f057 (diff) | |
| parent | dad9f0db9dbde73aeaccc4f5d27def15066cd618 (diff) | |
| download | Qt-b956e12165beb11e92f3d9b65aa488cd120ec6c8.zip Qt-b956e12165beb11e92f3d9b65aa488cd120ec6c8.tar.gz Qt-b956e12165beb11e92f3d9b65aa488cd120ec6c8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix compilation on WinXP MinGW32;
Add a new qconfig feature GESTURES
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 3f494d8..f23a94c 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -685,7 +685,9 @@ public: #ifndef QT_NO_ACTION QList<QAction*> actions; #endif +#ifndef QT_NO_GESTURES QMap<Qt::GestureType, Qt::GestureFlags> gestureContext; +#endif // Bit fields. uint high_attributes[4]; // the low ones are in QWidget::widget_attributes @@ -714,8 +716,9 @@ public: void updateX11AcceptFocus(); #elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine() +#ifndef QT_NO_GESTURES uint nativeGesturePanEnabled : 1; - +#endif bool shouldShowMaximizeButton(); void winUpdateIsOpaque(); void reparentChildren(); |