diff options
Diffstat (limited to 'doc/src/platforms')
| -rw-r--r-- | doc/src/platforms/linux.qdoc | 16 | ||||
| -rw-r--r-- | doc/src/platforms/osx.qdoc | 30 | ||||
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdocinc | 29 | ||||
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 12 |
5 files changed, 42 insertions, 47 deletions
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc index d8ccfdc9e..6b6538d8c 100644 --- a/doc/src/platforms/linux.qdoc +++ b/doc/src/platforms/linux.qdoc @@ -450,7 +450,7 @@ This documentation discusses specific deployment issues for \l{Qt for Linux/X11}. We will demonstrate the procedures in terms of deploying the - \l{tools/plugandpaint}{Plug & Paint} application that is provided in Qt's + \l{tools/plugandpaint/app}{Plug & Paint} application that is provided in Qt's examples directory. Due to the proliferation of Unix systems (such as commercial Unixes, Linux @@ -520,11 +520,11 @@ application. For more information, see the \l {Application Dependencies} section. - The \l {tools/plugandpaint}{Plug & Paint} example consists of + The \l {tools/plugandpaint/app}{Plug & Paint} example consists of several components: The core application (\l - {tools/plugandpaint}{Plug & Paint}), and the \l - {tools/plugandpaintplugins/basictools}{Basic Tools} and \l - {tools/plugandpaintplugins/extrafilters}{Extra Filters} + {tools/plugandpaint/app}{Plug & Paint}), and the \l + {tools/plugandpaint/plugins/basictools}{Basic Tools} and \l + {tools/plugandpaint/plugins/extrafilters}{Extra Filters} plugins. Since we cannot deploy plugins using the static linking approach, the executable we have prepared so far is incomplete. The application will run, but the functionality will @@ -534,7 +534,7 @@ \section1 Shared Libraries We have two challenges when deploying the \l - {tools/plugandpaint}{Plug & Paint} application using the shared + {tools/plugandpaint/app}{Plug & Paint} application using the shared libraries approach: The Qt runtime has to be correctly redistributed along with the application executable, and the plugins have to be installed in the correct location on the target @@ -549,7 +549,7 @@ \section2 Linking the Application to Qt as a Shared Library After ensuring that Qt is built as a shared library, we can build - the \l {tools/plugandpaint}{Plug & Paint} application. First, we + the \l {tools/plugandpaint/app}{Plug & Paint} application. First, we must go into the directory that contains the application: \snippet snippets/code/doc_src_deployment.qdoc 4 @@ -631,7 +631,7 @@ \snippet snippets/code/doc_src_deployment.pro 8 An archive distributing all the Qt libraries, and all the plugins, - required to run the \l {tools/plugandpaint}{Plug & Paint} + required to run the \l {tools/plugandpaint/app}{Plug & Paint} application, would have to include the following files: \table 100% diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc index e647215bc..eb61e2bb5 100644 --- a/doc/src/platforms/osx.qdoc +++ b/doc/src/platforms/osx.qdoc @@ -59,10 +59,7 @@ \section1 OS X Versions - OS X 10.7 "Lion" and 10.8 "Mountain Lion" are considered \l{Reference - Configurations}{reference configurations}, meaning they are tested by a - continuous integration (CI) system. Qt 5 applications may be deployed to Mac - OS X versions 10.6 "Snow Leopard", but support is limited. + See \l{Supported Platforms} for the list of OS X versions supported by Qt. Qt can be built for either x86 or x86_64. 64-bit is used by default. To select a 32-bit build, use the \c macx-clang-32 or \c macx-g++32 mkspec. @@ -113,8 +110,7 @@ \section1 Deploying Applications on OS X In general, Qt supports building on one OS X version and deploying to - earlier or later OS X versions. You can build on 10.7 Lion and run - the same binary on 10.6. The recommended way is to build on the + earlier or later OS X versions. The recommended way is to build on the latest version and deploy to an earlier OS X version. OS X applications are typically deployed as self-contained application @@ -672,7 +668,7 @@ This document describes how to create a \l{Qt for OS X}{OS X} bundle and make sure that the application finds the resources it needs at run-time. We demonstrate the procedures in terms of deploying the - \l{tools/plugandpaint}{Plug & Paint} example application that comes with the + \l{tools/plugandpaint/app}{Plug & Paint} example application that comes with the Qt installation package. The Qt installers for OS X include a \l @@ -749,7 +745,7 @@ \snippet snippets/code/doc_src_deployment.qdoc 30 Here is what the output looks like for the statically linked - \l {tools/plugandpaint}{Plug & Paint}: + \l {tools/plugandpaint/app}{Plug & Paint}: \snippet snippets/code/doc_src_deployment.qdoc 31 @@ -772,11 +768,11 @@ \snippet snippets/code/doc_src_deployment.qdoc 33 - The \l {tools/plugandpaint}{Plug & Paint} example consists of + The \l {tools/plugandpaint/app}{Plug & Paint} example consists of several components: The core application (\l - {tools/plugandpaint}{Plug & Paint}), and the \l - {tools/plugandpaintplugins/basictools}{Basic Tools} and \l - {tools/plugandpaintplugins/extrafilters}{Extra Filters} + {tools/plugandpaint/app}{Plug & Paint}), and the \l + {tools/plugandpaint/plugins/basictools}{Basic Tools} and \l + {tools/plugandpaint/plugins/extrafilters}{Extra Filters} plugins. As we cannot deploy plugins using the static linking approach, the bundle we have prepared so far is incomplete. The application will run, but the functionality will be disabled due @@ -818,7 +814,7 @@ \section2 Linking the Application to Qt as Frameworks After building Qt as frameworks, we can build the \l - {tools/plugandpaint}{Plug & Paint} application. First, we must go + {tools/plugandpaint/app}{Plug & Paint} application. First, we must go to the directory that contains the application: \snippet snippets/code/doc_src_deployment.qdoc 34 @@ -899,7 +895,7 @@ After this, we run \c otool again and see that the application can find the libraries. - The plugins for the \l {tools/plugandpaint}{Plug & + The plugins for the \l {tools/plugandpaint/app}{Plug & Paint} example makes it interesting. The basic steps we need to follow with plugins are: @@ -920,7 +916,7 @@ \snippet snippets/code/doc_src_deployment.qdoc 43 For example, If we run \c otool on the \l - {tools/plugandpaintplugins/basictools}{Basic Tools} plugin's \c + {tools/plugandpaint/plugins/basictools}{Basic Tools} plugin's \c .dylib file, we get the following information. \snippet snippets/code/doc_src_deployment.qdoc 44 @@ -1060,8 +1056,8 @@ \section2 OS X Version Dependencies - Qt 5 applications can be built and deployed on OS X 10.6 - (Snow Leopard) and higher. This is achieved using \e{weak linking}. In + Qt 5 applications can be built on the latest OS X version and deployed to + previous versions. This is achieved using \e{weak linking}. In \e{weak linking}, Qt tests whether a function added in a newer version of OS X is available on the computer it is running on. This allows Qt to use newer features when it runs on a newer diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index 7b5fe055e..9abd02faf 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -52,13 +52,13 @@ \l{Qt Platform Abstraction} (QPA), which makes it easier than before to port Qt into a new operating system. + \target Desktop Platforms \section1 Supported Configurations The following table lists configurations supported by The Qt Company. A \e {configuration} is a combination of an operating system version, a compiler version, and a graphics system. - \include supported-platforms.qdocinc latest In the above table, the configurations in \b bold are \e {reference configurations}. diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc index acbab0ead..db0f9f991 100644 --- a/doc/src/platforms/supported-platforms.qdocinc +++ b/doc/src/platforms/supported-platforms.qdocinc @@ -29,8 +29,7 @@ //! [embedded] Embedded Platforms: \l {Qt for Embedded Linux}{Embedded Linux}, \l {Windows CE - Introduction to using Qt}{Windows Embedded (Compact and Standard)}, -\l {QNX}, -VxWorks +\l {QNX} //! [embedded] //! [mobile] @@ -43,6 +42,8 @@ Mobile Platforms: \l {Qt for Android}{Android}, \section1 Qt 5.6 //! [5.6] //! [latest] + \b {Supported until Mar. 16, 2019} + \table 80% \header \li Platform \li Compiler \li Notes \header \li {3,1} \l {Qt for Windows}{Windows} @@ -94,15 +95,11 @@ Mobile Platforms: \l {Qt for Android}{Android}, \row \li {3,1} \header \li {3,1} \include supported-platforms.qdocinc embedded - \row \li Embedded Linux (iMX.6-armv7a) - \li \b {arm-poky-linux-gnueabi-gcc 4.9.1} - \li Yocto Project 1.7 'Dizzy', Ubuntu 14.04 (64-bit) host - \row \li Embedded Linux (arm-gnueabi) - \li arm-none-linux-gnueabi-gcc-4.4.1 - \li Sourcery G++ Lite 2010q1-202, Ubuntu 14.04 (32-bit) host + \row \li \l {Qt for Embedded Linux}{Embedded Linux} + \li GCC \li ARM Cortex-A, Intel boards with GCC-based toolchains \row \li QNX 6.6.0 (armv7le and x86) \li \b {As provided by QNX} - \li Ubuntu 14.04 (64-bit) host + \li Hosts: \b {Ubuntu 14.04 (64-bit)}, Windows \row \li Windows Embedded 7 (armv4i) \li MSVC 2008 \li Windows 7 host @@ -126,6 +123,7 @@ Mobile Platforms: \l {Qt for Android}{Android}, \section1 Qt 5.5 //! [5.5] + \b {Supported until Mar. 16, 2018} \table 80% \header \li Platform \li Compiler \li Notes @@ -172,6 +170,7 @@ Mobile Platforms: \l {Qt for Android}{Android}, \row \li {3,1} \header \li {3,1} \include supported-platforms.qdocinc embedded + and VxWorks (under a commercial license) \row \li Embedded Linux (arm-gnueabi) \li \b {arm-none-linux-gnueabi-gcc-4.4.1} \li Sourcery G++ Lite 2010q1-202, Ubuntu 14.04 (32-bit) host @@ -180,7 +179,7 @@ Mobile Platforms: \l {Qt for Android}{Android}, \li Sourcery G++ Lite 2010q1-202, Ubuntu 14.04 (64-bit) host \row \li QNX 6.6.0 (armv7le and x86) \li \b {As provided by QNX} - \li Ubuntu 14.04 host (64-bit) + \li Hosts: \b {Ubuntu 14.04 host (64-bit)}, Windows \row \li Windows Embedded 7 (armv4i) \li \b {MSVC 2008} \li Windows 7 host @@ -205,7 +204,7 @@ Mobile Platforms: \l {Qt for Android}{Android}, \section1 Qt 5.4 //! [5.4] - \b {Supported until 01.07.2017} + \b {Supported until July 01, 2017} \table 80% \header \li Platform \li Compiler \li Notes @@ -263,7 +262,7 @@ Mobile Platforms: \l {Qt for Android}{Android}, \li ourcery G++ Lite 2010q1-202, Ubuntu 12.04 (64-bit) host \row \li QNX 6.6.0 (armv7le and x86) \li \b {As provided by QNX} - \li Ubuntu 12.04 (64-bit) host + \li Hosts: \b {Ubuntu 12.04 (64-bit)}, Windows \row \li Windows Embedded 7 (armv4i) \li \b {MSVC 2008} \li Windows 7 host @@ -288,7 +287,7 @@ Mobile Platforms: \l {Qt for Android}{Android}, \section1 Qt 5.3 //! [5.3] - \b {Supported until 10.12.2016} + \b {Supported until Dec. 10, 2016} \table 80% \header \li Platform \li Compiler \li Notes @@ -348,7 +347,7 @@ Mobile Platforms: \l {Qt for Android}{Android}, \li Sourcery G++ Lite 2010q1-202, Ubuntu 12.04 host (64-bit) \row \li QNX 6.6.0 (armv7le and x86) \li \b {As provided by QNX} - \li Ubuntu 12.04 host (64-bit) + \li Hosts: \b {Ubuntu 12.04 host (64-bit)}, Windows \row \li Windows Embedded 7 (armv4i) \li \b {MSVC 2008} \li Windows 7 host @@ -373,7 +372,7 @@ Mobile Platforms: \l {Qt for Android}{Android}, \section1 Qt 5.2 //! [5.2] - \b {Supported until 20.05.2016} + \b {Supported until May 20, 2016} \table 80% \header \li Platform \li Compiler \li Notes diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 2bbd0584d..a11ef0924 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -667,10 +667,10 @@ \section2 Linking the Application to the Static Version of Qt - As an example, this section will build the \l{tools/plugandpaint}{Plug & Paint} + As an example, this section will build the \l{tools/plugandpaint/app}{Plug & Paint} example statically. - Once Qt finishes building, build the \l{tools/plugandpaint}{Plug & Paint} + Once Qt finishes building, build the \l{tools/plugandpaint/app}{Plug & Paint} application. First we must go into the directory that contains the application: @@ -704,7 +704,7 @@ \section1 Shared Libraries We have two challenges when deploying the \l - {tools/plugandpaint}{Plug & Paint} application using the shared + {tools/plugandpaint/app}{Plug & Paint} application using the shared libraries approach: The Qt runtime has to be correctly redistributed along with the application executable, and the plugins have to be installed in the correct location on the target @@ -719,7 +719,7 @@ \section2 Linking the Application to Qt as a Shared Library After ensuring that Qt is built as a shared library, we can build - the \l {tools/plugandpaint}{Plug & Paint} application. First, we + the \l {tools/plugandpaint/app}{Plug & Paint} application. First, we must go into the directory that contains the application: \snippet snippets/code/doc_src_deployment.qdoc 15 @@ -796,7 +796,7 @@ If the application starts without any problems, then we have successfully made a dynamically linked version of the \l - {tools/plugandpaint}{Plug & Paint} application. But the + {tools/plugandpaint/app}{Plug & Paint} application. But the application's functionality will still be missing since we have not yet deployed the associated plugins. @@ -812,7 +812,7 @@ \snippet snippets/code/doc_src_deployment.qdoc 18 An archive distributing all the Qt DLLs and application - specific plugins required to run the \l {tools/plugandpaint}{Plug + specific plugins required to run the \l {tools/plugandpaint/app}{Plug & Paint} application, would have to include the following files: \table 100% |