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, 11 insertions, 11 deletions

diff --git a/src/gui/kernel/qwindowsysteminterface_qpa_p.h b/src/gui/kernel/qwindowsysteminterface_qpa_p.h
index 121c997e8a..44746500aa 100644
--- a/src/gui/kernel/qwindowsysteminterface_qpa_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_qpa_p.h
@@ -60,9 +60,9 @@ public:
         Wheel,
         Key,
         Touch,
+        ScreenOrientation,
         ScreenGeometry,
         ScreenAvailableGeometry,
-        ScreenCountChange,
         Map,
         Unmap,
         Expose
@@ -194,25 +194,25 @@ public:
 
     };
 
-    class ScreenCountEvent : public WindowSystemEvent {
+    class ScreenOrientationEvent : public WindowSystemEvent {
     public:
-        ScreenCountEvent (int count)
-            : WindowSystemEvent(ScreenCountChange) , count(count) { }
-        int count;
+        ScreenOrientationEvent(QScreen *s)
+            : WindowSystemEvent(ScreenOrientation), screen(s) { }
+        QWeakPointer<QScreen> screen;
     };
 
     class ScreenGeometryEvent : public WindowSystemEvent {
     public:
-        ScreenGeometryEvent(int index)
-            : WindowSystemEvent(ScreenGeometry), index(index) { }
-        int index;
+        ScreenGeometryEvent(QScreen *s)
+            : WindowSystemEvent(ScreenGeometry), screen(s) { }
+        QWeakPointer<QScreen> screen;
     };
 
     class ScreenAvailableGeometryEvent : public WindowSystemEvent {
     public:
-        ScreenAvailableGeometryEvent(int index)
-            : WindowSystemEvent(ScreenAvailableGeometry), index(index) { }
-        int index;
+        ScreenAvailableGeometryEvent(QScreen *s)
+            : WindowSystemEvent(ScreenAvailableGeometry), screen(s) { }
+        QWeakPointer<QScreen> screen;
     };
 
     class MapEvent : public WindowSystemEvent {