diff options
Diffstat (limited to 'doc/src/platforms')
| -rw-r--r-- | doc/src/platforms/macos.qdoc | 21 | ||||
| -rw-r--r-- | doc/src/platforms/qnx.qdoc | 25 | ||||
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdocinc | 18 | ||||
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 13 |
4 files changed, 46 insertions, 31 deletions
diff --git a/doc/src/platforms/macos.qdoc b/doc/src/platforms/macos.qdoc index c213a679..f07df304 100644 --- a/doc/src/platforms/macos.qdoc +++ b/doc/src/platforms/macos.qdoc @@ -145,17 +145,24 @@ \section2 Architectures - By default, Qt is built for x86_64. To build for x86_64h (Haswell). use the - \c QMAKE_APPLE_DEVICE_ARCHS \c qmake variable. - This is selectable at configure time: + By default, Qt will build for the architecture of your development machine - + either \c x86_64, or \c arm64 if you are on an Apple Silicon Mac. + + To build for other architectures you can use the \c QMAKE_APPLE_DEVICE_ARCHS variables + in your project files or on the command line. This allows you to both cross-compile + to a different architecture, and to build universal (multi-architecture) binaries. + For example, to build your application for both \c x86_64 and \c arm64: + \code - ./configure -platform macx-clang QMAKE_APPLE_DEVICE_ARCHS=x86_64h + qmake ~/src/myapp QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" \endcode - \c QMAKE_APPLE_DEVICE_ARCHS can also be specified as a space-delimited list - in order to build for multiple architectures simultaneously: + When specifying the architectures in a project file they should not be quoted, e.g.: + \code - ./configure -platform macx-clang QMAKE_APPLE_DEVICE_ARCHS="x86_64 x86_64h" + TEMPLATE = app + SOURCES = main.cpp + QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64 \endcode \section1 Additional Command-Line Options diff --git a/doc/src/platforms/qnx.qdoc b/doc/src/platforms/qnx.qdoc index 73561252..0c12f1a2 100644 --- a/doc/src/platforms/qnx.qdoc +++ b/doc/src/platforms/qnx.qdoc @@ -40,15 +40,16 @@ QNX SDP (Software Development Platform) which includes QNX Neutrino RTOS components for various targets and a full set of development tools. - Qt 5 is currently tested and supported on QNX SDP 7.0, with support for - both 32-bit and 64-bit target architectures: + Qt 5 is currently tested and supported on QNX SDP 7.0 and 7.1, with support for + the following target architectures: \list - \li \c ARMle-v7 and \c x86 (32-bit) - \li \c AArch64le and \c x86-64 (64-bit) + \li \c (32-bit) ARMle-v7 and \c x86 (QNX 7.0 only) + \li \c (64-bit) AArch64le and \c x86-64 \endlist - Support for 64-bit architectures was added in QNX SDP 7.0. + \note Support for 64-bit architectures was added in QNX SDP 7.0. Support for + 32-bit x86 architecture was removed in QNX SDP 7.1. \section2 Previous Releases @@ -86,14 +87,12 @@ \section1 Build Requirements - Building Qt 5 requires the following packages available from the - \l {http://www.qnx.com/}{QNX website} (registration required for access - to downloads): + Building Qt 5 requires downloading, and installing of, QNX SDP 7.0 or 7.1 + from the + \l {http://www.qnx.com/}{QNX website}. - \list - \li \l {http://blackberry.qnx.com/en/sdp7/sdp70_download}{QNX SDP 7.0} - with \l {http://www.qnx.com/download/group.html?programid=26808} - \endlist + \note A suitable license is required. Contact (\l {mailto://info@qnx.com}{QNX} + for more information. The compiler and other parts of the tool chain are provided in the SDP packages. You do not need any additional installations on your host PC. @@ -299,6 +298,8 @@ \section1 Qt Creator Target Requirements + \note Qt Creator support has been tested with QNX 7.0 only. + A QNX Neutrino RTOS target used for development with Qt Creator should provide a few additional command line tools and services. diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc index 1edb4c7f..acacdf87 100644 --- a/doc/src/platforms/supported-platforms.qdocinc +++ b/doc/src/platforms/supported-platforms.qdocinc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -43,6 +43,10 @@ \li \c x86_64 \li GCC 5 or later, \b {GCC 10} \li + \row \li Red Hat Enterprise Linux 8.4 + \li \c x86_64 + \li \b {GCC 10.1 via gcc-toolset-10} + \li \row \li Red Hat Enterprise Linux 7.6 \li \c x86_64 \li \b {GCC 5.3.1 via devtoolset-4} @@ -63,8 +67,8 @@ \table 80% \header \li Target Platform \li Architecture \li Build Environment \row \li \macos 10.13, \macos 10.14, \macos 10.15, \macos 11 - \li \c x86_64 and \c x86_64h - \li Xcode 11 or \b {Xcode 12} (11 SDK) + \li \c x86_64 and \c x86_64h and \c arm64 + \li Xcode 11 or Xcode 12 or \b {Xcode 13} (12 SDK) \endtable //! [macos] @@ -72,7 +76,11 @@ //! [windows] \table 80% \header \li Operating System \li Architecture \li Compiler \li Notes - \row \li Windows 10 + \row \li Windows 11 21H2 + \li \c x86 and \c x86_64 + \li {MSVC 2019} + \li + \row \li Windows 10 21H2 \li \c x86 and \c x86_64 \li \b {MSVC 2019}, MSVC 2017, MSVC 2015, MinGW 8.1 \li @@ -100,7 +108,7 @@ \row \li Android 5.0 or later (that is, API Level 21 and up) \li \c armv7a and \c x86, \c arm64-v8 and \c x86_64 \li \b {Clang as provided by Google}, \b {MinGW 8.1} - \li \b {RHEL 7.x (x86_64)}, \b{\macos 10.15}, \b {Windows 10 (x86_64)} + \li {RHEL 8.x (x86_64)}, \b {RHEL 7.x (x86_64)}, \b{\macos 10.15}, \b {Windows 10 (x86_64)} \endtable //! [android] diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 651083a8..cb67bd52 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -75,12 +75,11 @@ \section2 Visual Studio Tools - The \l {Qt VS Tools} allows programmers to create, build, debug - and run Qt applications from within non-Express versions of Microsoft Visual Studio - 2013 and later. The add-in contains project wizards, Qt project import/export - support, integrated Qt resource manager and automated build setup for - the Qt Meta-Object Compiler, User Interface Compiler, and Resource - Compiler. + \l {Qt VS Tools} enables programmers to create, build, debug, and run + Qt applications from Microsoft Visual Studio. It contains project wizards, + Qt project import and export support, integrated Qt resource manager, + and automated build setup for the Qt Meta-Object Compiler, User Interface + Compiler, and Resource Compiler. */ |