summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-01-22 12:34:11 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-22 16:57:29 +0100
commit5f78a12da62e8ae406d2a01f92e70632d96b5322 (patch)
treece737f157066403f3f43304ff34f94e64f99ddcf
parent9de87e4976321f9063e92cfe93f89a1ed2889eb1 (diff)
Link to exact MinGW toolchain we support.
Change-Id: I111104e575d38cac673be853d826754668c1b442 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--doc/src/getting-started/installation.qdoc7
-rw-r--r--doc/src/platforms/platform-notes.qdoc3
-rw-r--r--doc/src/platforms/supported-platforms.qdoc2
3 files changed, 7 insertions, 5 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index f05237fe1..b33591021 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -634,9 +634,10 @@ in the \l{Qt for Windows CE Requirements} document.
\li Install Visual C++ 2010 SP1 Compiler Update for the Windows SDK 7.1
\endlist
\li Windows SDK 7.
- \li MinGW \l{mingw.org}, TDM MinGW \l{tdm-gcc.tdragon.net}, or MinGW-builds
- \l{http://sourceforge.net/projects/mingwbuilds/} with g++ version 4.7 or higher
- (not supported for all modules).
+ \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}
+ project.
\endlist
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index e1b84dc8c..5b2a08d66 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -185,7 +185,8 @@
We have tested Qt with this compiler on Windows 7.
The minimum version of MinGW-builds supported is GCC 4.7.2.
- MinGW-builds GCC 4.7.2 rev 1 and later should be able
+ \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, rev 8} and later should be able
to build Qt including QtWebKit.
\section2 Intel C++ Compiler (Windows, Altix)
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 59f7a1779..bf68d3522 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -340,7 +340,7 @@
\row \li Microsoft Windows 7 (32-bit)
\li MSVC 2010 SP1
\row \li Microsoft Windows 7 (32-bit)
- \li MinGW 4.7
+ \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
\row \li Apple Mac OS X 10.7 "Lion", Cocoa (64-bit)