summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-06-24 13:29:43 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-24 15:29:09 +0200
commit6468ef40bbf414dd4a16f97a49eb658d7ba2107b (patch)
treeac8f5ebda8e42a81b7017737b43c766aadd8ce69
parent99ad0e4b7062f0dcefcfe5ccb809554fd01e257b (diff)
Doc:Updated information about tested platforms.
-Adding Ubuntu 11.10 32-bit as a tested platform. -Updated Windows 7 and 8 compiler versions -Updated link to MinGW download Change-Id: If2acc11f044ad4623cb035eaefae9ba370f5c5a6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--doc/src/getting-started/installation.qdoc4
-rw-r--r--doc/src/platforms/supported-platforms.qdoc8
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 22c95d573..f53779729 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -636,8 +636,8 @@ in the \l{Qt for Windows CE Requirements} document.
\endlist
\li Windows SDK 7.
\li A MinGW toolchain with g++ version 4.7 or higher. Qt 5 is tested regularly with a \
- \l{http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.7.2/32-bit/threads-posix/sjlj/x32-4.7.2-release-posix-sjlj-rev8.7z}
- {32 bit gcc 4.7.2 toolchain} from the \l{http://mingwbuilds.sourceforge.net}{MinGW-builds}
+ \l{http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.8.0/32-bit/threads-posix/dwarf/x32-4.8.0-release-posix-dwarf-rev1.7z}
+ {32 bit gcc 4.8.0 toolchain} from the \l{http://mingwbuilds.sourceforge.net}{MinGW-builds}
project.
\endlist
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 648457f84..6e19376ba 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -326,16 +326,16 @@
\table
\header \li Platform
\li Compiler
- \row \li Ubuntu Linux 11.10, X11 (64-bit)
+ \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)
\li As provided by Ubuntu
\row \li Microsoft Windows 7 (32-bit)
\li MSVC 2010 SP1
\row \li Microsoft Windows 7 (32-bit)
- \li \l{http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.7.2/32-bit/threads-posix/sjlj/x32-4.7.2-release-posix-sjlj-rev8.7z}{MinGW-builds gcc 4.7.2 (32-bit)}
- \row \li Microsoft Windows 8 (64-bit)
- \li MSVC 2012
+ \li \l{http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.8.0/32-bit/threads-posix/dwarf/x32-4.8.0-release-posix-dwarf-rev1.7z}{MinGW-builds gcc 4.8.0 (32-bit)}
+ \row \li Microsoft Windows 8 (32-bit and 64-bit)
+ \li MSVC 2012 SP2
\row \li Apple Mac OS X 10.7 "Lion", Cocoa (64-bit)
\li Clang as provided by Apple
\row \li Apple Mac OS X 10.8 "Mountain Lion", Cocoa (64-bit)