diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 10:04:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 10:04:56 (GMT) |
| commit | ac0de5f1d783a32b4d3d40bf28daa1b252764483 (patch) | |
| tree | a294d1abbc463206c07ee596ed9f4df5355083eb /src/corelib/global/qnamespace.qdoc | |
| parent | 01245bcabf97dfdfdd23a2ec075b8de3e78bdeb2 (diff) | |
| parent | 8f8ad618261875e173c0e1d3931c1b7dd838d152 (diff) | |
| download | Qt-ac0de5f1d783a32b4d3d40bf28daa1b252764483.zip Qt-ac0de5f1d783a32b4d3d40bf28daa1b252764483.tar.gz Qt-ac0de5f1d783a32b4d3d40bf28daa1b252764483.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Fixed several typos.
Doc: remove \preliminary tag from public multimedia classes
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 6627c76..392ece3 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -157,7 +157,7 @@ \value AA_MacDontSwapCtrlAndMeta On Mac OS X by default, Qt swaps the Control and Meta (Command) keys (i.e., whenever Control is pressed, Qt - sends Meta and whenever Meta is pressed Control is sent. When this + sends Meta, and whenever Meta is pressed Control is sent). When this attribute is true, Qt will not do the flip. QKeySequence::StandardShortcuts will also flip accordingly (i.e., QKeySequence::Copy will be Command+C on the keyboard regardless of the value set, though what is output for @@ -493,7 +493,7 @@ \omitvalue WordBreak \omitvalue TextForceLeftToRight \omitvalue TextForceRightToLeft - \omitvalue TextLongestVariant Always use the longest variant when computing the size of a multi-variant string + \omitvalue TextLongestVariant Always use the longest variant when computing the size of a multi-variant string. You can use as many modifier flags as you want, except that Qt::TextSingleLine and Qt::TextWordWrap cannot be combined. @@ -2115,7 +2115,7 @@ On some platforms this implies Qt::WindowSystemMenuHint for it to work. \value MacWindowToolBarButtonHint On Mac OS X adds a tool bar button (i.e., - the oblong button that is on the top right of windows that have toolbars. + the oblong button that is on the top right of windows that have toolbars). \value BypassGraphicsProxyWidget Prevents the window and its children from automatically embedding themselves into a QGraphicsProxyWidget if the |