From a120f1a733ad53a3d248ce5acab393c4ff25a2a3 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 27 Jan 2012 13:39:45 +0100 Subject: Fix compilation of MeeGo/Maliit related code after Qt::ScreenOrientation API changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt::UnknownOrientation is now Qt::PrimaryOrientation. Change-Id: I2846a90bd11ecd1416c29b7bd861f180ccb129a1 Reviewed-by: Tor Arne Vestbø --- src/plugins/generic/meego/qmeegointegration.cpp | 2 +- src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.cpp | 2 +- src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/generic/meego/qmeegointegration.cpp b/src/plugins/generic/meego/qmeegointegration.cpp index 13f9e198d6..f387a889e9 100644 --- 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 0df21e3908..607dad6b94 100644 --- 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 6febe4703d..08c027d5c3 100644 --- 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, -- cgit v1.2.3