diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-08 12:46:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-08 12:46:20 (GMT) |
| commit | 3d852b4b4b6834688519e8a992ecaef391f8bde9 (patch) | |
| tree | ca21946e6461dba53b43fa3b761e9d782b1dc975 /src/corelib | |
| parent | b54d20070f6a483e0d6e4a06317de7cd8c817806 (diff) | |
| parent | 4e5c366afd6d6f8ccb3fc44cd2f6c522a3192b2d (diff) | |
| download | Qt-3d852b4b4b6834688519e8a992ecaef391f8bde9.zip Qt-3d852b4b4b6834688519e8a992ecaef391f8bde9.tar.gz Qt-3d852b4b4b6834688519e8a992ecaef391f8bde9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Fixed warnings and other problems found while fixing markup.
Doc: Adding documentation on configure options for Qt configure
Ensured that trailing newlines are quoted and correct atoms are used.
Fixed build breakage.
Fixed C++ and plain markup found in \c commands.
Doc: Document display-orientation-related widget attributes.
Added a configuration variable for the QML documentation file prefix.
Doc: Renamed a tutorial image to avoid a clash with another image.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 8440542..65cd7f4 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -1252,6 +1252,13 @@ to this top level window. This attribute has no effect on non-X11 platforms. + \value WA_LockPortraitOrientation Locks the widget to a portrait orientation, + ignoring changes to the display's orientation with respect to the user. + \value WA_LockLandscapeOrientation Locks the widget to a landscape orientation, + ignoring changes to the display's orientation with respect to the user. + \value WA_AutoOrientation Causes the widget to change orientation whenever the + display changes orientation with respect to the user. + \omitvalue WA_SetLayoutDirection \omitvalue WA_InputMethodTransparent \omitvalue WA_WState_CompressKeys |