summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication.h
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-02-26 14:39:00 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-05-11 13:38:54 (GMT)
commita3d8cfb1ee89e0600add864db53d67552820b95a (patch)
treed396d751de49d26c052b8752c94d5247503083e2 /src/gui/kernel/qapplication.h
parent7396eea79c9464d0c246106834cbce02320e7989 (diff)
downloadQt-a3d8cfb1ee89e0600add864db53d67552820b95a.zip
Qt-a3d8cfb1ee89e0600add864db53d67552820b95a.tar.gz
Qt-a3d8cfb1ee89e0600add864db53d67552820b95a.tar.bz2
Merge of the maemo-gestures branch onto qt/4.5.0
This is a squashed merge of all of the changes in the maemo-gestures branch on-top of the qt/4.5.0 branch.
Diffstat (limited to 'src/gui/kernel/qapplication.h')
-rw-r--r--src/gui/kernel/qapplication.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 2baf6dc..634226f 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -374,6 +374,7 @@ private:
friend class QDirectPainter;
friend class QDirectPainterPrivate;
#endif
+ friend class QGestureManager;
#if defined(Q_WS_WIN)
friend QApplicationPrivate* getQApplicationPrivateInternal();