diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 15:35:20 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 15:36:38 +0100 |
| commit | 715366bc280bd627f990d9651c4f174dc0f48b0a (patch) | |
| tree | 174c8154935017c3293e3977e46a48b036b265a8 /doc/src/platforms/supported-platforms.qdoc | |
| parent | 69330219480d125575351b35eba9269498cf5bc7 (diff) | |
| parent | 74f71cf2286bb95c2cb765a6f8f509136dffad4d (diff) | |
| download | qtdoc-715366bc280bd627f990d9651c4f174dc0f48b0a.tar.gz | |
Merge branch 'release' into stable
Conflicts:
doc/src/snippets/code/doc_src_qtscripttools.cpp
doc/src/snippets/code/doc_src_qtscripttools.pro
Change-Id: I0fb4d051bf488da5d4091dc070a6dfde86588a0f
Diffstat (limited to 'doc/src/platforms/supported-platforms.qdoc')
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index c2ea05da..3a09aee0 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -223,7 +223,7 @@ a wide range of Mac platform variants. \li \l{Qt for Mac OS X Requirements}{Qt for Mac OS X Requirements} - Software required to run Qt on Mac OS X. - \li \l{Installing Qt for X11 Platforms}{Installing Qt for X11 Platforms} + \li \l{Installing Qt for Mac OS X}{Installing Qt for Mac OS X} - Build Qt for Mac OS X development. \li \l{Platform and Compiler Notes - Mac OS X}{Platform and Compiler Notes - Mac OS X} - Platform specific notes. @@ -312,7 +312,7 @@ \list \li Embedded Linux (DirectFB, EGLFS, KMS, and Wayland) \li Windows Embedded (Compact and Standard) - \li Real-Time Operating Systems, such as QNX, VxWorks and INTEGRITY + \li Real-Time Operating Systems, such as \l{QNX}, VxWorks and INTEGRITY \endlist \section1 Mobile platforms @@ -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) |