summaryrefslogtreecommitdiffstats
path: root/doc/src/qtdesigner.qdoc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-05-20 11:24:25 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-05-20 11:24:25 (GMT)
commit1ee923a21c270094203c5d2a861a8015598ceda1 (patch)
treed53b292eabb1fc565840153d8f5efb3c3b2afd52 /doc/src/qtdesigner.qdoc
parent4e4ff34e3c4c905f17aa02160a17fdb7b9ad61ed (diff)
parent691e83425ac5883922837bc5fd1efb5385db9871 (diff)
downloadQt-1ee923a21c270094203c5d2a861a8015598ceda1.zip
Qt-1ee923a21c270094203c5d2a861a8015598ceda1.tar.gz
Qt-1ee923a21c270094203c5d2a861a8015598ceda1.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: doc/src/stylesheet.qdoc
Diffstat (limited to 'doc/src/qtdesigner.qdoc')
-rw-r--r--doc/src/qtdesigner.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/qtdesigner.qdoc b/doc/src/qtdesigner.qdoc
index 7e3b619..9699c5b 100644
--- a/doc/src/qtdesigner.qdoc
+++ b/doc/src/qtdesigner.qdoc
@@ -632,7 +632,7 @@
/*!
\fn void QDesignerContainerExtension::setCurrentIndex(int index)
- Sets the the currently selected page in the container to be the
+ Sets the currently selected page in the container to be the
page at the given \a index in the extension's list of pages.
\sa currentIndex()