Update QXbWindow orientation API

After orientation handling was split in window orientation
and content orientation QXcbWindow remained with the old api.
This patch renames setOrientation to handleContentOrientationChange,
fixing the issue of double status bar (portrait and landscape)
when running Qt5 apps with QtComponents on N9 in portrait mode.
(thanks to Simon for pointing out the difference between
changing the window and the content orientations)

Change-Id: I20d0be0c7f7e4593ac1e3c2ac2518144fc7fed0e
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>

diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 6996c87..ffce2f3 100644 (file)
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -1188,7 +1188,7 @@ void QXcbWindow::requestActivateWindow()
 }
 
 #if XCB_USE_MAEMO_WINDOW_PROPERTIES
-void QXcbWindow::setOrientation(Qt::ScreenOrientation orientation)
+void QXcbWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation)
 {
     int angle = 0;
     switch (orientation) {

diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index c8999de..523dd55 100644 (file)
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -95,7 +95,7 @@ public:
     void requestActivateWindow();
 
 #if XCB_USE_MAEMO_WINDOW_PROPERTIES
-    void setOrientation(Qt::ScreenOrientation orientation);
+    void handleContentOrientationChange(Qt::ScreenOrientation orientation);
 #endif
 
     bool setKeyboardGrabEnabled(bool grab);