diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-10-26 10:41:56 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-10-26 10:41:56 (GMT) |
| commit | 968f7c0e65a293a7d7b9a87601e853894d9794ed (patch) | |
| tree | 3a86b71dd69cf4b759bb20b62c18cfeb02a28ef0 /doc/src | |
| parent | 3481db791c3b48e28f1a9531b247adf6562edb71 (diff) | |
| parent | e2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff) | |
| download | Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.zip Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.tar.gz Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.tar.bz2 | |
Merge branch '4.6' into 4.6-platform
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/images/simpleanchorlayout-example.png | bin | 0 -> 13463 bytes | |||
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/qt-webpages.qdoc | 2 |
3 files changed, 1 insertions, 3 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/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 */ |
