diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:41 +0100 |
| commit | 24e2b39e7a06687322a18a158a083eb51a7c0dca (patch) | |
| tree | 1a32caf6dd6db74fbac9553a094bb00b216fa678 /src/quick/items/qquickwindow.cpp | |
| parent | 39540124dd0900e0c99dcda8c0ebdf4f3cea8d5e (diff) | |
| parent | daff5f2988cef31442629a48c3b3088abf01837a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 63a3b5d820..b8c180e2fd 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3317,7 +3317,7 @@ void QQuickWindow::resetOpenGLState() additional content like popups, dialogs, status bars, or similar in relation to the window. - The recommended orientation is \l Screen.orientation, but + The recommended orientation is \l {Screen::orientation}{Screen.orientation}, but an application doesn't have to support all possible orientations, and thus can opt to ignore the current screen orientation. |