summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qevent.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-20 14:09:29 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-20 14:09:29 (GMT)
commit7871ebfc4d2adf2313c7431c9d6fa221a903b81d (patch)
treea7574187277d5615e26ab4a9f4b1b27b8b6e5422 /src/gui/kernel/qevent.h
parent4fbf19955d5c018d8f12611d39348b48be3ff006 (diff)
parent991a5ed5a8dc0c81d56c88823bd69d986618d4e5 (diff)
downloadQt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.zip
Qt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.tar.gz
Qt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.tar.bz2
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'src/gui/kernel/qevent.h')
-rw-r--r--src/gui/kernel/qevent.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 9839269..461cc92 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -787,6 +787,8 @@ public:
private:
QTouchEventTouchPointPrivate *d;
+ friend class QApplication;
+ friend class QApplicationPrivate;
};
enum DeviceType {
@@ -818,6 +820,7 @@ protected:
Qt::TouchPointStates _touchPointStates;
QList<QTouchEvent::TouchPoint> _touchPoints;
+ friend class QApplication;
friend class QApplicationPrivate;
};