summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qevent_p.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-09 07:43:42 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-09 07:43:42 (GMT)
commitd2bcb0dfbc79c382dad87d3d2154ca127ae8fc16 (patch)
treec0848d1fc8fd2215fe32d75dcbe86354b0344282 /src/gui/kernel/qevent_p.h
parentdbbe24f0f04e5a0aaf9223b73bee873e208a1fa7 (diff)
parentb8b7f98b01d9ad03fecac7a0f593ac5734d7af1d (diff)
downloadQt-d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16.zip
Qt-d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16.tar.gz
Qt-d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16.tar.bz2
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h
Diffstat (limited to 'src/gui/kernel/qevent_p.h')
-rw-r--r--src/gui/kernel/qevent_p.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h
index 6e6ab01..4aaaa8b 100644
--- a/src/gui/kernel/qevent_p.h
+++ b/src/gui/kernel/qevent_p.h
@@ -43,6 +43,7 @@
#define QEVENT_P_H
#include <QtCore/qglobal.h>
+#include <QtCore/qurl.h>
#include <QtGui/qevent.h>
QT_BEGIN_NAMESPACE
@@ -164,6 +165,18 @@ public:
QMap<Qt::GestureType, QWidget *> targetWidgets;
};
+
+class QFileOpenEventPrivate
+{
+public:
+ inline QFileOpenEventPrivate(const QUrl &url)
+ : url(url)
+ {
+ }
+
+ QUrl url;
+};
+
QT_END_NAMESPACE
#endif // QEVENT_P_H