diff options
| author | axis <qt-info@nokia.com> | 2009-10-27 08:32:25 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-27 08:32:25 (GMT) |
| commit | 51bfafed59d77b791f0266fa1bfc36634597c5c4 (patch) | |
| tree | 630d9fbc5aad375950b03d80cf775c228f31a741 /doc/src | |
| parent | cb3a2633bb9d8a0e949c403d0f0631caef254599 (diff) | |
| parent | 5a4909d9f87b9abf471908a085c0e9f31b7e0a50 (diff) | |
| download | Qt-51bfafed59d77b791f0266fa1bfc36634597c5c4.zip Qt-51bfafed59d77b791f0266fa1bfc36634597c5c4.tar.gz Qt-51bfafed59d77b791f0266fa1bfc36634597c5c4.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src')
| -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/qt-webpages.qdoc | 2 |
3 files changed, 4 insertions, 5 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/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 */ |
