Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master

1 files changed, 15 insertions, 12 deletions

diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index f611fe4ab7..96e630ed0a 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -53,6 +53,7 @@
 #include <QtCore/qmap.h>
 #include <QtCore/qvector.h>
 #include <QtCore/qset.h>
+#include <QtCore/qurl.h>
 #include <QtCore/qfile.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qtouchdevice.h>
@@ -647,10 +648,11 @@ public:
     ~QFileOpenEvent();
 
     inline QString file() const { return f; }
-    QUrl url() const;
+    QUrl url() const { return m_url; }
     bool openFile(QFile &file, QIODevice::OpenMode flags) const;
 private:
     QString f;
+    QUrl m_url;
 };
 
 #ifndef QT_NO_TOOLBAR
@@ -686,8 +688,7 @@ protected:
 class Q_GUI_EXPORT QWindowStateChangeEvent: public QEvent
 {
 public:
-    explicit QWindowStateChangeEvent(Qt::WindowStates aOldState);
-    QWindowStateChangeEvent(Qt::WindowStates aOldState, bool isOverride);
+    explicit QWindowStateChangeEvent(Qt::WindowStates aOldState, bool isOverride = false);
     ~QWindowStateChangeEvent();
 
     inline Qt::WindowStates oldState() const { return ostate; }
@@ -695,6 +696,7 @@ public:
 
 private:
     Qt::WindowStates ostate;
+    bool m_override;
 };
 
 #ifndef QT_NO_DEBUG_STREAM
@@ -837,7 +839,6 @@ protected:
 Q_DECLARE_TYPEINFO(QTouchEvent::TouchPoint, Q_MOVABLE_TYPE);
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTouchEvent::TouchPoint::InfoFlags)
 
-class QScrollPrepareEventPrivate;
 class Q_GUI_EXPORT QScrollPrepareEvent : public QEvent
 {
 public:
@@ -855,12 +856,14 @@ public:
     void setContentPos(const QPointF &pos);
 
 private:
-    QScrollPrepareEventPrivate *d_func();
-    const QScrollPrepareEventPrivate *d_func() const;
+    QObject* m_target;
+    QPointF m_startPos;
+    QSizeF m_viewportSize;
+    QRectF m_contentPosRange;
+    QPointF m_contentPos;
 };
 
 
-class QScrollEventPrivate;
 class Q_GUI_EXPORT QScrollEvent : public QEvent
 {
 public:
@@ -879,11 +882,11 @@ public:
     ScrollState scrollState() const;
 
 private:
-    QScrollEventPrivate *d_func();
-    const QScrollEventPrivate *d_func() const;
+    QPointF m_contentPos;
+    QPointF m_overshoot;
+    QScrollEvent::ScrollState m_state;
 };
 
-class QScreenOrientationChangeEventPrivate;
 class Q_GUI_EXPORT QScreenOrientationChangeEvent : public QEvent
 {
 public:
@@ -894,8 +897,8 @@ public:
     Qt::ScreenOrientation orientation() const;
 
 private:
-    QScreenOrientationChangeEventPrivate *d_func();
-    const QScreenOrientationChangeEventPrivate *d_func() const;
+    QScreen *m_screen;
+    Qt::ScreenOrientation m_orientation;
 };
 
 QT_END_NAMESPACE