diff options
-rw-r--r-- | doc/src/getting-started/installation.qdoc | 7 | ||||
-rw-r--r-- | doc/src/platforms/android.qdoc | 1 | ||||
-rw-r--r-- | doc/src/platforms/ios.qdoc | 5 | ||||
-rw-r--r-- | doc/src/platforms/macosx.qdoc | 18 | ||||
-rw-r--r-- | doc/src/platforms/platform-notes.qdoc | 73 | ||||
-rw-r--r-- | doc/src/platforms/wince-customization.qdoc | 12 | ||||
-rw-r--r-- | doc/src/platforms/wince-introduction.qdoc | 2 |
7 files changed, 15 insertions, 103 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index f5a9d656..0dc4efd5 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -162,13 +162,6 @@ in the \l{Qt for Windows CE Requirements} document. \li \l{Windows CE - Signing} \endlist - Information on feature and performance tuning for embedded builds can - be found on the following pages: - \list - \li \l{Fine-Tuning Features in Qt} - \li \l{Qt Performance Tuning} - \endlist - We hope you will enjoy using Qt. Good luck! */ diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc index eafe63de..0a0874f9 100644 --- a/doc/src/platforms/android.qdoc +++ b/doc/src/platforms/android.qdoc @@ -66,6 +66,7 @@ The following topics provide more details about how to use Qt for Android: \title Getting Started with Qt for Android \brief Provides instructions to install and configure your development environment. +\section1 Requirements In order to use Qt for Android, you need the following: \list diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc index 23708beb..b6586b51 100644 --- a/doc/src/platforms/ios.qdoc +++ b/doc/src/platforms/ios.qdoc @@ -83,8 +83,8 @@ We assume that you have cloned the Qt 5 repositories (or obtained the Qt sources elsewhere) and followed the platform independent - requirements for building Qt. The requirements are described - \l{General Qt Requirements}{here}. + requirements for building Qt. The process of building Qt is found + in the \l{Building Qt Sources} page. We can then build Qt. This is done from the Qt 5 top directory, like so: @@ -148,4 +148,3 @@ \l{https://qt-project.org/wiki/Mixing_C_and_ObjectiveC_Code}{here}. */ - diff --git a/doc/src/platforms/macosx.qdoc b/doc/src/platforms/macosx.qdoc index 435117fd..a311da1a 100644 --- a/doc/src/platforms/macosx.qdoc +++ b/doc/src/platforms/macosx.qdoc @@ -812,8 +812,8 @@ We assume that you already have installed Qt as frameworks, which is the default when installing Qt, in the /path/to/Qt - directory. For more information on how to build Qt, see the \l - Installation documentation. + directory. For more information on how to build Qt without Frameworks, + visit the \l{Qt for Mac OS X - Specific Issues} documentation. When installing, the identification name of the frameworks is set. This name is used by the dynamic linker (\c dyld) to find the libraries for your @@ -1059,14 +1059,12 @@ \snippet snippets/code/doc_src_deployment.qdoc 50 - Unlike the deployment processes on \l {Deploying an Application on - X11 Platforms}{X11} and \l {Deploying an Application on - Windows}{Windows}, compiler-specific libraries rarely have to - be redistributed with your application. But there are several ways to - deploy applications, as Qt can be configured, built, and installed in - several ways on Mac OS X. Typically your goals help determine how you - are going to deploy the application. The last sections describe a few - things that you must be aware of while deploying your application. + Compiler-specific libraries rarely have to be redistributed with your + application. But there are several ways to deploy applications, as Qt can be + configured, built, and installed in several ways on Mac OS X. Typically your + goals help determine how you are going to deploy the application. The last + sections describe a few things that you must be aware of while deploying + your application. \section2 Mac OS X Version Dependencies diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc deleted file mode 100644 index 492caca2..00000000 --- a/doc/src/platforms/platform-notes.qdoc +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page platform-notes.html - \title Platform and Compiler Notes - \brief Information about the platforms on which Qt can be used. - - This page contains information about the platforms Qt is currently known - to run on, with links to platform-specific notes, including any known bugs - or incompatibilities. - - Information about the combinations of platforms and compilers - supported by Qt can be found on the \l{Supported Platforms} page. - - \list - \li \l{Platform and Compiler Notes - X11} - \tableofcontents{1 Platform and Compiler Notes - X11} - \li \l{Platform and Compiler Notes - Windows} - \tableofcontents{1 Platform and Compiler Notes - Windows} - \li \l{Platform and Compiler Notes - Mac OS X} - \tableofcontents{1 Platform and Compiler Notes - Mac OS X} - \li \l{Platform and Compiler Notes - QNX} - \tableofcontents{1 Platform and Compiler Notes - QNX} - \li \l{Platform and Compiler Notes - VxWorks} - \tableofcontents{1 Platform and Compiler Notes - VxWorks} - \li \l{Platform and Compiler Notes - Android} - \tableofcontents{1 Platform and Compiler Notes - Android} - \endlist - - \section1 General Compiler Notes - - \section2 Supported Features - - Qt can be compiled with any compiler that is compliant with the C++98 standard. C++11 - support is automatically enabled on compilers supporting it. - - Building Qt is currently being tested on the following list of compilers: - - \list - \li gcc 4.2.1 (Mac OS X only) - \li Apple clang 3.1 (Mac OS X / XCode 4) - \li gcc 4.5 and newer (Linux) - \li MSVC 2008 and newer - \li MinGW-builds GCC 4.7.2 - \li Intel CC (latest version) - \endlist - -*/ diff --git a/doc/src/platforms/wince-customization.qdoc b/doc/src/platforms/wince-customization.qdoc index 19c908c3..6d76e43a 100644 --- a/doc/src/platforms/wince-customization.qdoc +++ b/doc/src/platforms/wince-customization.qdoc @@ -104,17 +104,13 @@ However, it is possible to exclude features of Qt and create a version that compiles for the desired SDK. - Further information on stripping features can be found in the - \l{Fine-Tuning Features in Qt}{QFeatures} documentation. - - \section1 Making Qt Applications Start on a Custom Device Sometimes, a Windows CE device has been created with a configuration different from the corresponding SDK's configuration. In this case, symbols that were available at linking stage will be missing from the run-time libraries. - + Unfortunately, the operating system will not provide an error message that mentions which symbols are absent. Instead, a message box with the following message will appear: @@ -124,7 +120,7 @@ To identify the missing symbols, you need to create a temporary application that attempts to dynamically load the Qt for Windows CE libraries using \c LoadLibrary. The following code can be used for this: - + \snippet snippets/code/doc_src_wince-customization.cpp 9 Once you have compiled and deployed the application as well as the Qt @@ -132,7 +128,7 @@ ordinal number of the unresolved symbol. Search for parts of Qt that rely on these functions and disable them using - the \l{Fine-Tuning Features in Qt}{QFeatures} functionality. + the QFeatures functionality. In our experience, when Qt applications do not start on Windows CE, it is usually the result of missing symbols for the following classes or @@ -151,7 +147,7 @@ */ -/*! +/*! \page shadow builds-wince.html \ingroup qtce \title Windows CE - Using shadow builds diff --git a/doc/src/platforms/wince-introduction.qdoc b/doc/src/platforms/wince-introduction.qdoc index d3dccefc..4226f0b9 100644 --- a/doc/src/platforms/wince-introduction.qdoc +++ b/doc/src/platforms/wince-introduction.qdoc @@ -52,8 +52,6 @@ \li \list \li \l {Qt for Windows CE Hardware Accelerated Graphics}{Hardware Accelerated Graphics} - \li \l {Qt Performance Tuning} - \li \l {Fine-Tuning Features in Qt} \endlist \endtable */ |