diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 03:49:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 03:49:56 (GMT) |
| commit | 8e1327f1d5caee67203a21929b1d85fb92d59cec (patch) | |
| tree | 457886d0d114af8b160a66eaa1ee561518ee2784 /doc | |
| parent | a8ff8e81f7b120e1ecdd434093be075cdd92fb24 (diff) | |
| parent | a49f2700c6b5c0f5851f9cfab38b5554e9530577 (diff) | |
| download | Qt-8e1327f1d5caee67203a21929b1d85fb92d59cec.zip Qt-8e1327f1d5caee67203a21929b1d85fb92d59cec.tar.gz Qt-8e1327f1d5caee67203a21929b1d85fb92d59cec.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff
Fix QTextEngine overflow caused by extremely long text
Replace the SSE prologues by a macro
QDom: Do not crash on "<a:>text</a:>"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/widgets-and-layouts/stylesheet.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc index 1390376..977f641 100644 --- a/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -925,7 +925,7 @@ The scroller is styled using the \l{#scroller-sub}{::scroller}. - The tear-off is styled using the \l{#tear-off-sub}{::tear-off}. + The tear-off is styled using the \l{#tearoff-sub}{::tearoff}. See \l{Qt Style Sheets Examples#Customizing QMenu}{Customizing QMenu} for an example. @@ -3337,7 +3337,7 @@ \o The tear indicator of a QTabBar. \row - \o \c ::tear-off \target tear-off-sub + \o \c ::tearoff \target tearoff-sub \o The tear-off indicator of a QMenu. \row |