whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Simon Hausmann 2012-01-27 13:39:45 +01:00 committed by Qt by Nokia
parent 11eefaf0f7
commit a120f1a733
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/generic/meego/qmeegointegration.cpp
View File

@ -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.

2
src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.cpp
View File

@ -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:

2
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -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,