diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-07 14:45:56 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-07 14:45:56 (GMT) |
| commit | ce5f772c529517c3e1c043fd826a790316ed9915 (patch) | |
| tree | 159d306fedb648d659ecd6bc90c93225d1d2e6e1 /src/gui/kernel/qapplication_p.h | |
| parent | a628b5579a977594cf125110589c8bd5096db380 (diff) | |
| parent | 55c983e33d974d046d8deab8b68b85efdb9eb03a (diff) | |
| download | Qt-ce5f772c529517c3e1c043fd826a790316ed9915.zip Qt-ce5f772c529517c3e1c043fd826a790316ed9915.tar.gz Qt-ce5f772c529517c3e1c043fd826a790316ed9915.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 14d7215..f8943a8 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -84,6 +84,7 @@ class QInputContext; class QObject; class QWidget; class QSocketNotifier; +class QGestureManager; extern bool qt_is_gui_used; #ifndef QT_NO_CLIPBOARD @@ -509,6 +510,7 @@ public: void sendSyntheticEnterLeave(QWidget *widget); #endif + QGestureManager *gestureManager; QWidget *gestureWidget; QMap<int, QWeakPointer<QWidget> > widgetForTouchPointId; |