summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-02-25 16:07:49 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-02-25 15:26:04 +0000
commit28fedba03b135a187e9eb0985b972fb034a92e85 (patch)
treeeb9cb5dbfedef80f85d56785698dc4e81f1e5eec
parentbe4f5d55fcb7715460ab08b4e50b0468555cd065 (diff)
Fix various qdoc-warnings.
qtbase/src/corelib/itemmodels/qitemselectionmodel.cpp:1199: warning: Undocumented parameter 'model' in QItemSelectionModel::modelChanged() qtbase/src/corelib/plugin/qpluginloader.cpp:420: warning: Can't link to 'staticPlugin()' qtbase/src/gui/text/qtextdocument.cpp:1452: warning: No such parameter 'from' in QTextDocument::find() qtbase/src/testlib/qtestcase.cpp:2770: warning: No documentation for 'QTest::qExtractTestData()' Change-Id: I76758dbdf3ad7b0ae1f14de0407a6fde523827d0 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
-rw-r--r--src/corelib/itemmodels/qitemselectionmodel.cpp2
-rw-r--r--src/corelib/plugin/qpluginloader.cpp2
-rw-r--r--src/gui/text/qtextdocument.cpp2
-rw-r--r--src/testlib/qtestcase.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp
index 7e23709f1b..3882da30a7 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.cpp
+++ b/src/corelib/itemmodels/qitemselectionmodel.cpp
@@ -1200,7 +1200,7 @@ void QItemSelectionModel::select(const QModelIndex &index, QItemSelectionModel::
\fn void QItemSelectionModel::modelChanged(QAbstractItemModel *model)
\since 5.5
- This signal is emitted when the model is successfully set with setModel().
+ This signal is emitted when the \a model is successfully set with setModel().
\sa model(), setModel()
*/
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index 0bdf9034ee..8ed9199c60 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -420,7 +420,7 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin plugin)
/*!
Returns a list of static plugin instances (root components) held
by the plugin loader.
- \sa staticPlugin()
+ \sa staticPlugins()
*/
QObjectList QPluginLoader::staticInstances()
{
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index d243cf0b13..e8dd663354 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1453,7 +1453,7 @@ QTextCursor QTextDocument::find(const QRegExp & expr, int from, FindFlags option
\overload
Finds the next occurrence, matching the regular expression, \a expr, in the document.
- The search starts at the position of the given \a from cursor, and proceeds
+ The search starts at the position of the given from \a cursor, and proceeds
forwards through the document unless specified otherwise in the search
options. The \a options control the type of search performed. The FindCaseSensitively
option is ignored for this overload, use QRegExp::caseSensitivity instead.
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index acac632410..fa2080fe69 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -2757,7 +2757,7 @@ static inline bool isWindowsBuildDirectory(const QString &dirName)
}
#endif
-/* !
+/*!
Extract a directory from resources to disk. The content is extracted
recursively to a temporary folder. The extracted content is not removed
automatically.