diff options
author | Topi Reinio <topi.reinio@digia.com> | 2015-06-15 12:57:04 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-22 04:25:05 +0000 |
commit | 01a1ca7eefa4774c6e278bf2b73f8ffe4c582807 (patch) | |
tree | cf5c6af20afebcae6ea6d14cf28ea7448cb2ac76 /doc/src/platforms | |
parent | 58e39f635a9e822802750ca38b619b4e68ac8700 (diff) | |
download | qtdoc-01a1ca7eefa4774c6e278bf2b73f8ffe4c582807.tar.gz |
- Linux: Replace Ubuntu 11.10/12.04 with 14.04/RHEL 6.6
- QNX: Drop support for SDP 6.5
- Drop mention about Windows XP being tested
Task-number: QTBUG-46665
Change-Id: Ia101cec231f09c9db12e99347735fd98c2e58e4a
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'doc/src/platforms')
-rw-r--r-- | doc/src/platforms/platform-notes-rtos.qdoc | 22 | ||||
-rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 10 |
2 files changed, 6 insertions, 26 deletions
diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc index 76af7663..a3b5f854 100644 --- a/doc/src/platforms/platform-notes-rtos.qdoc +++ b/doc/src/platforms/platform-notes-rtos.qdoc @@ -33,8 +33,8 @@ Qt for VxWorks is available only under a commercial license. - Please contact Qt sales at Digia to find out more: - http://info.qt.digia.com/contact-qt + Please contact Qt sales to find out more: + \l http://www.qt.io/contact-us/ */ @@ -58,7 +58,7 @@ \li \l {http://www.qnx.com/download/group.html?programid=26076}{QNX CAR Platform 2.1}. \endlist - Qt 5 is currently tested and supported on QNX SDP 6.5 SP1 and on SDP 6.6 with QNX SDK for + Qt 5 is currently tested and supported on QNX SDP 6.6 with QNX SDK for Apps and Media, see the section \l {Build Requirements} for more details. Supported architectures are ARMle-v7 and x86. Older QNX SDP releases and other architectures may also work, but are not subject to regular builds and testing. @@ -98,12 +98,6 @@ \l{http://www.qnx.com/download/group.html?programid=26072}{QNX SDK for Apps and Media 1.0} which provides \c{fontconfig} and multimedia support along with other features. In this case, Qt will use the internal font database instead of \c{fontconfig}, and \l{Multimedia}{multimeida} will be not functional. - \li \l {http://www.qnx.com/download/group.html?programid=20905}{SDP 6.5.0 SP1} - supplemented by the \l {http://www.qnx.com/developers/docs/660/topic/com.qnx.doc.screen/topic/manual/cscreen_about.html} - {QNX Screen Graphics Subsystem} (also called just "Screen") as an add-on. The Screen is - a standard component of SDP 6.6 and newer, but for SDP 6.5 it is available upon a request - only, contact QNX Software Systems (info@qnx.com). You should also install possibly all - patches for SDP 6.5 as provided by QNX Software Systems. \endlist The compiler and other parts of the tool chain are provided in the SDP packages. You do not need @@ -134,16 +128,6 @@ target folder where Qt will be installed and places all build artifacts outside of the source code tree. - As noted above, building Qt 5 with QNX SDP 6.5.0 SP1 requires the Screen. Qt 5 needs - related headers and libraries and will not build if they are not available. QNX SDP 6.5.0 SP1 - contains an older version of SQLite which is not supported by Qt 5 anymore. You should use the - SQLite provided with the Qt 5 source code. This is the default behavior of \c{configure} anyway, - just do not force the system SQLite with \c{-system-sqlite}. QNX SDP 6.5.0 SP1 does not provide - fontconfig. Qt will fall back to its internal font database. This limits the flexibility with - handling fonts, but it is not a serious issue for most projects. Many other Qt 5 add-on modules - will probably not build with QNX SDP 6.5.0 SP1, since their development has advanced too far - to support that older release of SDP. - \section1 Qt Runtime Target Requirements QNX Software Systems delivers software solutions for making embedded devices. This includes diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index 84f3379a..69423a9e 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -115,11 +115,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 @@ -167,10 +165,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) |