diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:04:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:04:05 +0200 |
| commit | 3856c794d2f2e8d848429fbd775f67cfa8e156b2 (patch) | |
| tree | d46f0703d6acf25829693396e9303e8f50fdc19a /doc/src/platforms/supported-platforms.qdoc | |
| parent | 34d6120522b60b08dde92ce64d57be9d17f675d6 (diff) | |
| parent | 01a1ca7eefa4774c6e278bf2b73f8ffe4c582807 (diff) | |
| download | qtdoc-3856c794d2f2e8d848429fbd775f67cfa8e156b2.tar.gz | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I21b0a8a1c2a0c45e75c57406bbbaf66ad924d9cd
Diffstat (limited to 'doc/src/platforms/supported-platforms.qdoc')
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index 5fd2a9c8..113582c7 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -114,11 +114,9 @@ \table \header \li Platform \li Compiler - \row \li Ubuntu Linux 11.10, X11 (32-bit and 64-bit) - \li As provided by Ubuntu - \row \li Ubuntu Linux 12.04, X11 (64-bit) + \row \li Ubuntu Linux 14.04, X11 (64-bit) \li As provided by Ubuntu - \row \li RedHat 6.5, X11 (64-bit) + \row \li RedHat 6.6, X11 (64-bit) \li As provided by Red Hat \row \li openSUSE 13.1, X11 (64-bit) \li As provided by SUSE @@ -166,10 +164,8 @@ \table \header \li Platform \li Compiler - \row \li Ubuntu Linux 10.04, X11 (32-bit) + \row \li Ubuntu Linux 11.10, X11 (32-bit and 64-bit) \li As provided by Ubuntu - \row \li Microsoft Windows XP (32-bit) - \li MSVC 2008 SP1 \row \li Microsoft Windows CE 7.0 \li MSVC 2008 SP1 \row \li Apple OS X 10.7 "Lion", Cocoa (64-bit) |