Added Orientation API to QScreen and QWindow.

QScreen now has a primary and current orientation, and a QWindow can set
its orientation as well. The current screen orientation is just a hint
to the application.

Change-Id: I4635982cfac2d16634d4edd5c6ab78e9d0ac55a4
Reviewed-on: http://codereview.qt-project.org/5988
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

1 files changed, 4 insertions, 12 deletions

diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 7e9ca97051..eea9b2bdf1 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -69,6 +69,7 @@ class QAction;
 #ifndef QT_NO_GESTURES
 class QGesture;
 #endif
+class QScreen;
 
 class Q_GUI_EXPORT QInputEvent : public QEvent
 {
@@ -840,24 +841,15 @@ class QScreenOrientationChangeEventPrivate;
 class Q_GUI_EXPORT QScreenOrientationChangeEvent : public QEvent
 {
 public:
-    enum Orientation {
-        Portrait = 1,
-        Landscape = 2,
-        PortraitInverted = 4,
-        LandscapeInverted = 8
-    };
-    QScreenOrientationChangeEvent(qint32 screenOrientationInDegrees);
-    QScreenOrientationChangeEvent(Orientation screenOrientation);
+    QScreenOrientationChangeEvent(QScreen *screen, Qt::ScreenOrientation orientation);
     ~QScreenOrientationChangeEvent();
 
-    bool isValid() const;
-    qint32 orientationInDegrees() const;
-    Orientation orientation() const;
+    QScreen *screen() const;
+    Qt::ScreenOrientation orientation() const;
 
 private:
     QScreenOrientationChangeEventPrivate *d_func();
     const QScreenOrientationChangeEventPrivate *d_func() const;
-
 };
 
 QT_END_NAMESPACE