summaryrefslogtreecommitdiffstats
path: root/doc/src/widgets-and-layouts/stylesheet.qdoc
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2010-08-17 05:30:30 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2010-08-17 05:30:30 (GMT)
commitae1fde5d436a047c124f8382fdcd71bb1af306e3 (patch)
treea937de1c678aaeda2f12fac891f49930d244e954 /doc/src/widgets-and-layouts/stylesheet.qdoc
parent50a53d2f7a7e12cd597dc72a08ad62b79fee4554 (diff)
parent8afc6773067bb878020c29b3bebfe8662e3fbfdd (diff)
downloadQt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.zip
Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.tar.gz
Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'doc/src/widgets-and-layouts/stylesheet.qdoc')
-rw-r--r--doc/src/widgets-and-layouts/stylesheet.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 1390376..5c72570 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -32,7 +32,7 @@
\ingroup frameworks-technologies
- \previouspage {Implementing Styles and Style Aware Widgets}{Styles}
+ \previouspage {Styles and Style Aware Widgets}{Styles}
\contentspage Widgets and Layouts
\nextpage The Style Sheet Syntax
@@ -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