diff options
| -rw-r--r-- | examples/designer/doc/src/taskmenuextension.qdoc | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/extension/default_extensionfactory.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/extension/qextensionmanager.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/sdk/membersheet.qdoc | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/sdk/propertysheet.qdoc | 4 | ||||
| -rw-r--r-- | src/designer/src/lib/sdk/taskmenu.qdoc | 2 | ||||
| -rw-r--r-- | src/qdoc/aggregate.cpp | 2 | ||||
| -rw-r--r-- | src/qdoc/doc/qdoc-manual-markupcmds.qdoc | 2 | ||||
| -rw-r--r-- | src/qdoc/generator.cpp | 2 | ||||
| -rw-r--r-- | src/qdoc/tree.cpp | 2 | ||||
| -rw-r--r-- | src/shared/qtpropertybrowser/qtpropertybrowser.cpp | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/examples/designer/doc/src/taskmenuextension.qdoc b/examples/designer/doc/src/taskmenuextension.qdoc index 440c2b28b..d6e43a12e 100644 --- a/examples/designer/doc/src/taskmenuextension.qdoc +++ b/examples/designer/doc/src/taskmenuextension.qdoc @@ -10,7 +10,7 @@ menu entries that are associated with the plugin. The Task Menu Extension example shows how to create a custom - widget plugin for \l {Qt Designer Manual}{\QD}, and how to to use + widget plugin for \l {Qt Designer Manual}{\QD}, and how to use the QDesignerTaskMenuExtension class to provide custom task menu entries associated with the plugin. diff --git a/src/designer/src/lib/extension/default_extensionfactory.cpp b/src/designer/src/lib/extension/default_extensionfactory.cpp index 9ddeb5049..c67f721cd 100644 --- a/src/designer/src/lib/extension/default_extensionfactory.cpp +++ b/src/designer/src/lib/extension/default_extensionfactory.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE For a complete example using the QExtensionFactory class, see the \l {taskmenuextension}{Task Menu Extension example}. The example shows how to create a custom widget plugin for Qt - Designer, and how to to use the QDesignerTaskMenuExtension class + Designer, and how to use the QDesignerTaskMenuExtension class to add custom items to Qt Designer's task menu. \sa QExtensionManager, QAbstractExtensionFactory diff --git a/src/designer/src/lib/extension/qextensionmanager.cpp b/src/designer/src/lib/extension/qextensionmanager.cpp index b146a51b3..ca9a4f2b6 100644 --- a/src/designer/src/lib/extension/qextensionmanager.cpp +++ b/src/designer/src/lib/extension/qextensionmanager.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE For a complete example using the QExtensionManager class, see the \l {taskmenuextension}{Task Menu Extension example}. The example shows how to create a custom widget plugin for Qt - Designer, and how to to use the QDesignerTaskMenuExtension class + Designer, and how to use the QDesignerTaskMenuExtension class to add custom items to \QD's task menu. \sa QExtensionFactory, QAbstractExtensionManager diff --git a/src/designer/src/lib/sdk/membersheet.qdoc b/src/designer/src/lib/sdk/membersheet.qdoc index 3b454c233..a1871b8a0 100644 --- a/src/designer/src/lib/sdk/membersheet.qdoc +++ b/src/designer/src/lib/sdk/membersheet.qdoc @@ -88,7 +88,7 @@ For a complete example using an extension class, see \l {taskmenuextension}{Task Menu Extension example}. The example shows how to create a custom widget plugin for Qt - Designer, and how to to use the QDesignerTaskMenuExtension class + Designer, and how to use the QDesignerTaskMenuExtension class to add custom items to \QD's task menu. \sa QExtensionFactory, QExtensionManager, {Creating Custom Widget diff --git a/src/designer/src/lib/sdk/propertysheet.qdoc b/src/designer/src/lib/sdk/propertysheet.qdoc index 8198335b3..5804ecb1b 100644 --- a/src/designer/src/lib/sdk/propertysheet.qdoc +++ b/src/designer/src/lib/sdk/propertysheet.qdoc @@ -105,7 +105,7 @@ Or you can use an existing factory, expanding the QExtensionFactory::createExtension() function to make the factory - able to create a property sheet extension extension as well. For + able to create a property sheet extension as well. For example: \snippet plugins/doc_src_qtdesigner.cpp 18 @@ -113,7 +113,7 @@ For a complete example using an extension class, see the \l {taskmenuextension}{Task Menu Extension example}. The example shows how to create a custom widget plugin for Qt - Designer, and how to to use the QDesignerTaskMenuExtension class + Designer, and how to use the QDesignerTaskMenuExtension class to add custom items to \QD's task menu. \sa QExtensionFactory, QExtensionManager, {Creating Custom Widget diff --git a/src/designer/src/lib/sdk/taskmenu.qdoc b/src/designer/src/lib/sdk/taskmenu.qdoc index 1fe59274e..5e1375952 100644 --- a/src/designer/src/lib/sdk/taskmenu.qdoc +++ b/src/designer/src/lib/sdk/taskmenu.qdoc @@ -81,7 +81,7 @@ For a complete example using the QDesignerTaskMenuExtension class, see the \l {taskmenuextension}{Task Menu Extension example}. The example shows how to create a custom widget plugin - for \QD, and how to to use the QDesignerTaskMenuExtension + for \QD, and how to use the QDesignerTaskMenuExtension class to add custom items to \QD's task menu. \sa QExtensionFactory, QExtensionManager, {Creating Custom Widget diff --git a/src/qdoc/aggregate.cpp b/src/qdoc/aggregate.cpp index f3893926c..0ecc6d337 100644 --- a/src/qdoc/aggregate.cpp +++ b/src/qdoc/aggregate.cpp @@ -407,7 +407,7 @@ void Aggregate::addFunction(FunctionNode *fn) Aggregate's function map. The function is also removed from the overload list - that's relative to the the original parent \a firstParent. + that's relative to the original parent \a firstParent. \note This is a private function. */ diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc index dee95f7e1..2f0d95efe 100644 --- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc @@ -997,7 +997,7 @@ \section2 Highlighting and autolinking The \\code commands attempts to parse its contents as code of a - specific language, as defined in the the \l {language-variable}{language} + specific language, as defined in the \l {language-variable}{language} configuration variable. This provides highlighting and automatic linking to types detected in the code. diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index 579e1ced6..d18529fe9 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -109,7 +109,7 @@ void Generator::appendFullName(Text &text, const Node *apparentNode, const QStri /*! Append the signature for the function named in \a node to - \a text, so that is is a link to the documentation for that + \a text, so that is a link to the documentation for that function. */ void Generator::appendSignature(Text &text, const Node *node) diff --git a/src/qdoc/tree.cpp b/src/qdoc/tree.cpp index 8037fa5b4..05deb92f8 100644 --- a/src/qdoc/tree.cpp +++ b/src/qdoc/tree.cpp @@ -1097,7 +1097,7 @@ void Tree::insertQmlType(const QString &key, QmlTypeNode *n) /*! Finds the function node with the specifried name \a path that also has the specified \a parameters and returns a pointer to - the the first matching function node if one is found. + the first matching function node if one is found. This function begins searching the tree at \a relative for the \l {FunctionNode} {function node} identified by \a path diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp index 5ab0660fb..7ee8a199c 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp @@ -1561,7 +1561,7 @@ void QtAbstractPropertyBrowserPrivate::slotPropertyDataChanged(QtProperty *prope \a item of the property as parameters. The passed \a item is deleted just after this call is finished. - If the the parent of \a item is 0, the removed \a item was a + If the parent of \a item is 0, the removed \a item was a top level property in this editor. This function must be reimplemented in derived classes. Note that |