summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-08-05 17:48:14 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-08-05 17:48:14 (GMT)
commit9d15caa7f1103060f5fe1f8283e834ff51591a3f (patch)
treef9abea10c806270db22c2ffb93f1d6b819ea7865
parent909c084d0c275ec5e747f395b7e0cd39a1d052bc (diff)
parenta49f2700c6b5c0f5851f9cfab38b5554e9530577 (diff)
downloadQt-9d15caa7f1103060f5fe1f8283e834ff51591a3f.zip
Qt-9d15caa7f1103060f5fe1f8283e834ff51591a3f.tar.gz
Qt-9d15caa7f1103060f5fe1f8283e834ff51591a3f.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
-rw-r--r--doc/src/widgets-and-layouts/stylesheet.qdoc4
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