summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@trolltech.com>2009-07-15 14:53:49 (GMT)
committerPeter Hartmann <peter.hartmann@trolltech.com>2009-07-15 14:53:49 (GMT)
commit9075ec9011e5f678563ab15024e8d9731e938963 (patch)
tree318ef1dada6756b0e4522207406f208d74ccc3ee /doc
parent97f82b2344334fa158f20e4ed059984fd3c43162 (diff)
parente9a4c7f9e86d9b00d1e1690a8d842152413cd1ed (diff)
downloadQt-9075ec9011e5f678563ab15024e8d9731e938963.zip
Qt-9075ec9011e5f678563ab15024e8d9731e938963.tar.gz
Qt-9075ec9011e5f678563ab15024e8d9731e938963.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc')
-rw-r--r--doc/src/designer-manual.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc
index 25e7455..c67865d 100644
--- a/doc/src/designer-manual.qdoc
+++ b/doc/src/designer-manual.qdoc
@@ -1360,7 +1360,7 @@
inside. Both widgets and spacers can be used inside containers.
Stacked widgets, tab widgets, and toolboxes are handled specially in \QD.
- Norwally, when adding pages (tabs, pages, compartments) to these containers
+ Normally, when adding pages (tabs, pages, compartments) to these containers
in your own code, you need to supply existing widgets, either as
placeholders or containing child widgets. In \QD, these are automatically
created for you, so you can add child objects to each page straight away.