diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-10-21 00:43:19 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-10-21 00:43:19 (GMT) |
| commit | f6b1582d726f97d8be4b30f0f6da2350220f27c5 (patch) | |
| tree | 64bcea1b8b3cc8f94073a9e83b36b2b40ad990e8 /src/gui/kernel/qwidget_p.h | |
| parent | 110c58a20f3158143d83ebea4f2ece4f7925f913 (diff) | |
| parent | 7bd7f5ec6eb520b7d9940a24817b17132d9ed6a2 (diff) | |
| download | Qt-f6b1582d726f97d8be4b30f0f6da2350220f27c5.zip Qt-f6b1582d726f97d8be4b30f0f6da2350220f27c5.tar.gz Qt-f6b1582d726f97d8be4b30f0f6da2350220f27c5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index c06ef73..f7c2712 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -64,6 +64,8 @@ #include "QtGui/qapplication.h" #include <private/qgraphicseffect_p.h> +#include <private/qgesture_p.h> + #ifdef Q_WS_WIN #include "QtCore/qt_windows.h" #include <private/qdnd_p.h> @@ -294,7 +296,8 @@ public: void setMask_sys(const QRegion &); #ifdef Q_OS_SYMBIAN void setSoftKeys_sys(const QList<QAction*> &softkeys); - void activateSymbianWindow(); + void activateSymbianWindow(WId wid = 0); + void _q_delayedDestroy(WId winId); #endif void raise_sys(); @@ -578,6 +581,7 @@ public: #ifndef QT_NO_ACTION QList<QAction*> actions; #endif + QMap<Qt::GestureType, Qt::GestureContext> gestureContext; // Bit fields. uint high_attributes[3]; // the low ones are in QWidget::widget_attributes @@ -604,6 +608,7 @@ public: bool isBackgroundInherited() const; #elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine() + uint nativeGesturePanEnabled : 1; bool shouldShowMaximizeButton(); void winUpdateIsOpaque(); |