diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-26 17:53:45 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-26 17:53:45 (GMT) |
| commit | 8f4160b70888218677e976a68e205f4ca8b7d740 (patch) | |
| tree | 60d392c1f112b6807ddbfda7ff3a40bb6c5b75bf /doc | |
| parent | 9b0c0faf73dbdc382f1c02a42b10018bf9961d72 (diff) | |
| parent | 83aa359398a8a510ac732410c918d31eedeeb4f8 (diff) | |
| download | Qt-8f4160b70888218677e976a68e205f4ca8b7d740.zip Qt-8f4160b70888218677e976a68e205f4ca8b7d740.tar.gz Qt-8f4160b70888218677e976a68e205f4ca8b7d740.tar.bz2 | |
Merge remote branch 'origin/4.6'
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/images/simpleanchorlayout-example.png | bin | 0 -> 13463 bytes | |||
| -rw-r--r-- | doc/src/platforms/qt-embedded.qdoc | 7 | ||||
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/qt-webpages.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 2 |
5 files changed, 5 insertions, 8 deletions
diff --git a/doc/src/images/simpleanchorlayout-example.png b/doc/src/images/simpleanchorlayout-example.png Binary files differnew file mode 100644 index 0000000..1d5c8ac --- /dev/null +++ b/doc/src/images/simpleanchorlayout-example.png diff --git a/doc/src/platforms/qt-embedded.qdoc b/doc/src/platforms/qt-embedded.qdoc index c39a967..e0c35cc 100644 --- a/doc/src/platforms/qt-embedded.qdoc +++ b/doc/src/platforms/qt-embedded.qdoc @@ -68,10 +68,9 @@ environment and use native features, such as menus, to conform to the native style guidelines. \o \l{Symbian platform - Introduction to using Qt}{Qt for the Symbian -platform} is used to create - applications running in existing Symbian platform environments. - Applications use the appropriate style for the embedded - environment and use native features, such as menus, to conform + platform} is used to create applications running in existing Symbian + platform environments. Applications use the appropriate style for the + embedded environment and use native features, such as menus, to conform to the native style guidelines. \endtable */ diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index 4c3929a..302ecb4 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -106,10 +106,8 @@ \o Compilers \row \o Windows XP, Vista \o gcc 3.4.2 (MinGW) - \omit \row \o Windows 7 \o MSVC 2008 - \endomit \row \o Apple Mac OS X 10.6 "Snow Leopard" \o As provided by Apple \row \o Apple Mac OS X 10.4 "Tiger" diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc index 7287656..1eee805 100644 --- a/doc/src/qt-webpages.qdoc +++ b/doc/src/qt-webpages.qdoc @@ -165,7 +165,7 @@ */ /*! - \externalpage http://qt.nokia.com/products/qtopia/ + \externalpage http://www.qtextended.org/ \title Qt Extended */ diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index cecff0e..4943984 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -834,7 +834,7 @@ these settings when you edit forms. More information about these improvements can be found in the - \l{What's New in Qt Designer 4.6} overview. + \l{What's New in Qt Designer 4.5} overview. \section1 Qt Linguist Improvements |
