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/corelib | |
| 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/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 37be933393..53ad12ed4e 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -1821,8 +1821,7 @@ This enum type specifies the various orientations a screen might have. - \value PrimaryOrientation The display's primary orientation. The QWindow and QScreen APIs never return this value, - instead it will be mapped to the corresponding QScreen's QScreen::primaryOrientation(). + \value PrimaryOrientation The display's primary orientation. \value LandscapeOrientation Landscape orientation, display width is greater than display height. \value PortraitOrientation Portrait orientation, display height is greater than display width, rotated 90 degree clockwise relative to landscape. |