From 752a02143b8b29bfde40d1e70482bc051457f251 Mon Sep 17 00:00:00 2001 From: Teemu Katajisto Date: Thu, 9 Feb 2012 10:17:53 +0200 Subject: Various documentation fixes ported from Qt 4.8 Final set of selected documentation fixes for qtbase from Qt 4.8 commit bacae725e584f51ee2fd83af7bef3e4515de9587 Task-number: QTBUG-13362 Task-number: QTBUG-18356 Task-number: QTBUG-18417 Task-number: QTBUG-18664 Task-number: QTBUG-21562 Task-number: QTBUG-22094 Task-number: QTBUG-18741 Task-number: QTBUG-15921 Task-number: QTBUG-15738 Change-Id: I3bd33bb7ce7aa991913ba82f3ea0e4b124f3ee41 Reviewed-by: Casper van Donderen --- doc/src/examples/editabletreemodel.qdoc | 5 +++-- doc/src/network/files-and-resources/resources.qdoc | 4 ++-- doc/src/snippets/code/src_corelib_thread_qmutex.cpp | 4 ++-- doc/src/sql/sql-programming/sql-driver.qdoc | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/src/examples/editabletreemodel.qdoc b/doc/src/examples/editabletreemodel.qdoc index 20d9efccd7..306295842e 100644 --- a/doc/src/examples/editabletreemodel.qdoc +++ b/doc/src/examples/editabletreemodel.qdoc @@ -48,14 +48,15 @@ As described in the \l{Model Subclassing Reference}, models must provide implementations for the standard set of model functions: \l{QAbstractItemModel::}{flags()}, \l{QAbstractItemModel::}{data()}, - \l{QAbstractItemModel::}{headerData()}, and + \l{QAbstractItemModel::}{headerData()}, + \l{QAbstractItemModel::}{columnCount()}, and \l{QAbstractItemModel::}{rowCount()}. In addition, hierarchical models, such as this one, need to provide implementations of \l{QAbstractItemModel::}{index()} and \l{QAbstractItemModel::}{parent()}. An editable model needs to provide implementations of \l{QAbstractItemModel::}{setData()} and - \l{QAbstractItemModel::}{headerData()}, and must return a suitable + \l{QAbstractItemModel::}{setHeaderData()}, and must return a suitable combination of flags from its \l{QAbstractItemModel::}{flags()} function. Since this example allows the dimensions of the model to be changed, diff --git a/doc/src/network/files-and-resources/resources.qdoc b/doc/src/network/files-and-resources/resources.qdoc index 847f086bee..1d0fc51631 100644 --- a/doc/src/network/files-and-resources/resources.qdoc +++ b/doc/src/network/files-and-resources/resources.qdoc @@ -101,8 +101,8 @@ In this case, the file is accessible as \c :/myresources/cut-img.png. - Some resources, such as translation files and icons, many need to - change based on the user's locale. This is done by adding a \c lang + Some resources need to change based on the user's locale, + such as translation files or icons. This is done by adding a \c lang attribute to the \c qresource tag, specifying a suitable locale string. For example: diff --git a/doc/src/snippets/code/src_corelib_thread_qmutex.cpp b/doc/src/snippets/code/src_corelib_thread_qmutex.cpp index 84fe348eb2..f5fbeb8419 100644 --- a/doc/src/snippets/code/src_corelib_thread_qmutex.cpp +++ b/doc/src/snippets/code/src_corelib_thread_qmutex.cpp @@ -114,8 +114,8 @@ int complexFunction(int flag) switch (flag) { case 0: case 1: - mutex.unlock(); - return moreComplexFunction(flag); + retVal = moreComplexFunction(flag); + break; case 2: { int status = anotherFunction(); diff --git a/doc/src/sql/sql-programming/sql-driver.qdoc b/doc/src/sql/sql-programming/sql-driver.qdoc index 994d31f43f..667b9eba54 100644 --- a/doc/src/sql/sql-programming/sql-driver.qdoc +++ b/doc/src/sql/sql-programming/sql-driver.qdoc @@ -494,7 +494,7 @@ \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 15 Users of MinGW may wish to consult the following online document: - \l{Compiling PostgreSQL On Native Win32 FAQ}. + \l{PostgreSQL MinGW/Native Windows}. \bold{Note:} This database plugin is not supported for Windows CE. -- cgit v1.2.3