diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-01-25 13:41:43 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-26 08:32:28 +0100 |
| commit | 71db6d654ec4a3166325933ca3a9f5859013c110 (patch) | |
| tree | cc23527fe27b7324a8ee0ffcb434e990d40de935 /src/gui/kernel/qscreen.cpp | |
| parent | 0bca94cf380a4fc55cf3a46de979d0618f3fa455 (diff) | |
Made QWindow::currentOrientation() a property.
To match the previous QWindow::orientation() property which can be
useful to access from QML. Also, removed the automatic translation of
Qt::PrimaryOrientation to QScreen::primaryOrientation() on the QWindow
level, as it leads to a lot of complexity regarding the
QWindow::contentOrientationChanged() signal, and makes it hard to
distinguish between the case where the window's orientation follows
that of the screen, and the case where the orientation just happens to
be set to that of the screen.
Change-Id: I6950d1337b7f929815eff1328181855090d8066b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/kernel/qscreen.cpp')
| -rw-r--r-- | src/gui/kernel/qscreen.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index 43c2dcc50d..d8413d5cb2 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -351,6 +351,8 @@ QRect QScreen::availableVirtualGeometry() const will change based on the device is being held, and a desktop display might be rotated so that it's in portrait mode. + Qt::PrimaryOrientation is never returned. + \sa primaryOrientation(), orientationChanged() */ Qt::ScreenOrientation QScreen::orientation() const |