summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-17 18:22:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-17 18:22:47 (GMT)
commit379b4dc81177b95c15de30c5925efca1136e4041 (patch)
tree44e70fde281072eb4c56d79bf8b92f6e9c4b5a6b /doc/src
parent94a3356d5eb7b255d439efe2699bf3a9b025e8eb (diff)
parent672c0d15ad07aaffeb7354e9fd8a822ee0d36ac2 (diff)
downloadQt-379b4dc81177b95c15de30c5925efca1136e4041.zip
Qt-379b4dc81177b95c15de30c5925efca1136e4041.tar.gz
Qt-379b4dc81177b95c15de30c5925efca1136e4041.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a small typo in assistant manual: hompage -> homepage Print icon in doc pages has no effect. Assistant has unnecessary repaints when expand/collapse selected node. Compile fixes. Changelog: Added Designer/uic3 changes for 4.7.0.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/development/assistant-manual.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/development/assistant-manual.qdoc b/doc/src/development/assistant-manual.qdoc
index 7d56ea1..afc6361 100644
--- a/doc/src/development/assistant-manual.qdoc
+++ b/doc/src/development/assistant-manual.qdoc
@@ -359,7 +359,7 @@
The \menu{Options} page lets you specify the homepage \QA will display when
you click the \gui{Home} button in \QA's main user interface. You can specify
- the hompage by typing it here or clicking on one of the buttons below the
+ the homepage by typing it here or clicking on one of the buttons below the
textbox. \gui{Current Page} sets the currently displayed page as your home
page while \gui{Restore to default} will reset your home page to the default
home page.