summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorartoka <arto.katajasalo@digia.com>2011-12-08 12:04:10 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-01-31 16:31:38 (GMT)
commitbacae725e584f51ee2fd83af7bef3e4515de9587 (patch)
tree6275b15e915e38c6e2ffb988354ea8ed3ada31d4 /doc/src
parent40fb4750910e23d3e7128ca8e0f1c5920b05bd5a (diff)
downloadQt-bacae725e584f51ee2fd83af7bef3e4515de9587.zip
Qt-bacae725e584f51ee2fd83af7bef3e4515de9587.tar.gz
Qt-bacae725e584f51ee2fd83af7bef3e4515de9587.tar.bz2
Various Qt documentation fixes (wk 44)
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-22172 Task-number: QTBUG-15738 Change-Id: I1d383a22612cd4fbcb7e03751e76409ca57fe7a2 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/examples/editabletreemodel.qdoc5
-rw-r--r--doc/src/external-resources.qdoc4
-rw-r--r--doc/src/files-and-resources/resources.qdoc4
-rw-r--r--doc/src/index.qdoc1
-rw-r--r--doc/src/snippets/code/src_corelib_thread_qmutex.cpp4
-rw-r--r--doc/src/sql-programming/sql-driver.qdoc2
6 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/examples/editabletreemodel.qdoc b/doc/src/examples/editabletreemodel.qdoc
index 6966ac5..d31e694 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/external-resources.qdoc b/doc/src/external-resources.qdoc
index 2107669..7f40229 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -235,8 +235,8 @@
*/
/*!
- \externalpage http://www.postgresql.org/docs/faqs.FAQ_MINGW.html
- \title Compiling PostgreSQL On Native Win32 FAQ
+ \externalpage http://www.postgresql.org/docs/current/static/installation-platform-notes.html#INSTALLATION-NOTES-MINGW
+ \title PostgreSQL MinGW/Native Windows
*/
/*!
diff --git a/doc/src/files-and-resources/resources.qdoc b/doc/src/files-and-resources/resources.qdoc
index 8ca19f3..53850fe 100644
--- a/doc/src/files-and-resources/resources.qdoc
+++ b/doc/src/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/index.qdoc b/doc/src/index.qdoc
index c72c377..cf98c3b 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -40,7 +40,6 @@
\o \l{How to Learn Qt}
\o \l{Introduction to Qt Quick}{Qt Quick}
\o \l{Qt Whitepaper}{Qt C++ Framework}
- \o \l{Introduction to Qt Quick}{Qt Quick}
\o \l{external: Qt Mobility Manual}{Qt Mobility}
\o \l{Qt WebKit}
\endlist
diff --git a/doc/src/snippets/code/src_corelib_thread_qmutex.cpp b/doc/src/snippets/code/src_corelib_thread_qmutex.cpp
index b52709c..fcee45d 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-programming/sql-driver.qdoc b/doc/src/sql-programming/sql-driver.qdoc
index b918da5..04e6f8b 100644
--- a/doc/src/sql-programming/sql-driver.qdoc
+++ b/doc/src/sql-programming/sql-driver.qdoc
@@ -495,7 +495,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.