summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauro Neto <lauro.neto@openbossa.org>2012-04-24 15:35:15 -0300
committerQt by Nokia <qt-info@nokia.com>2012-05-02 22:38:11 +0200
commit31a5fb1fa297f292e8fba2df947fc18c217445fa (patch)
treed1bfea125182b490470f857fbb96d9c7dcf936b6
parent266913a64996fb74045b191cbd8bf349b42147a9 (diff)
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>
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp2
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 6996c87f3f..ffce2f3956 100644
--- 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 c8999de83d..523dd559c1 100644
--- 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);