Fix compilation of MeeGo/Maliit related code after Qt::ScreenOrientation API changes

Qt::UnknownOrientation is now Qt::PrimaryOrientation.

Change-Id: I2846a90bd11ecd1416c29b7bd861f180ccb129a1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>

diff --git a/src/plugins/generic/meego/qmeegointegration.cpp b/src/plugins/generic/meego/qmeegointegration.cpp
index 13f9e19..f387a88 100644 (file)
--- a/src/plugins/generic/meego/qmeegointegration.cpp
+++ b/src/plugins/generic/meego/qmeegointegration.cpp
@@ -62,7 +62,7 @@ QMeeGoIntegration::~QMeeGoIntegration()
 void QMeeGoIntegration::updateScreenOrientation(const QVariant& topEdgeValue)
 {
     QString edge = topEdgeValue.toString();
-    Qt::ScreenOrientation orientation = Qt::UnknownOrientation;
+    Qt::ScreenOrientation orientation = Qt::PrimaryOrientation;
 
     // ### FIXME: This isn't perfect. We should obey the video_route (tv connected) and
     // the keyboard slider.

diff --git a/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.cpp b/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.cpp
index 0df21e3..607dad6 100644 (file)
--- a/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.cpp
@@ -75,7 +75,7 @@ enum MaliitOrientationAngle {
 static int orientationAngle(Qt::ScreenOrientation orientation)
 {
     switch (orientation) {
-    case Qt::UnknownOrientation: // Urgh.
+    case Qt::PrimaryOrientation: // Urgh.
     case Qt::PortraitOrientation:
         return Angle270;
     case Qt::LandscapeOrientation:

diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 6febe47..08c027d 100644 (file)
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -1156,7 +1156,7 @@ void QXcbWindow::setOrientation(Qt::ScreenOrientation orientation)
         case Qt::LandscapeOrientation: angle = 0; break;
         case Qt::InvertedPortraitOrientation: angle = 90; break;
         case Qt::InvertedLandscapeOrientation: angle = 180; break;
-        case Qt::UnknownOrientation: break;
+        case Qt::PrimaryOrientation: break;
     }
     Q_XCB_CALL(xcb_change_property(xcb_connection(), XCB_PROP_MODE_REPLACE, m_window,
                                    atom(QXcbAtom::MeegoTouchOrientationAngle), XCB_ATOM_CARDINAL, 32,