diff options
author | Topi Reinio <topi.reinio@digia.com> | 2014-04-14 14:55:12 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-25 06:45:06 +0200 |
commit | 2e30101d80e118aa2e2cf30418260b1c327bed7b (patch) | |
tree | 2d5ae684328f247d78222929ede196cc8e326e8c | |
parent | 889f869a1071ace91cf5698856f629e79e779357 (diff) | |
download | qtdoc-2e30101d80e118aa2e2cf30418260b1c327bed7b.tar.gz |
Doc: List more platforms on Building from Sources page
Separate building from source instructions from the getting
started documentation for Qt for iOS.
Add links to build instructions for Embedded Linux, Android, iOS,
and WinRT platforms to 'Building Qt Sources' page and update the
links on 'Qt Configure Options'.
Task-number: QTBUG-37145
Change-Id: I4e9bfbfb55dbb2f6f63e68b105987b5e587189b7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r-- | doc/src/configure.qdoc | 6 | ||||
-rw-r--r-- | doc/src/getting-started/installation.qdoc | 25 | ||||
-rw-r--r-- | doc/src/platforms/ios.qdoc | 68 |
3 files changed, 65 insertions, 34 deletions
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc index 3843888e..f3f63bfc 100644 --- a/doc/src/configure.qdoc +++ b/doc/src/configure.qdoc @@ -234,10 +234,12 @@ The following pages provide guidelines on how to configure Qt for specific platform development: \list - \li \l{http://qt-project.org/wiki/Qt5ForAndroidBuilding}{Building Qt 5 for Android} Wiki page - \li \l{Qt for iOS}{iOS} + \li \l{Building Qt 5 for Android} Wiki page + \li \l{Qt for iOS - Building from Source} + \li \l{Qt for WinRT#Building from source}{Qt for WinRT - Building from Source} \li \l{Qt for BlackBerry} - a community-driven site for BlackBerry and QNX devices + \li \l{Qt for Embedded Linux#Configuring for a Specific Device}{Qt for Embedded Linux - Building from Source} \li \l{http://qt-project.org/wiki/Qt-RaspberryPi}{Qt for Raspberry Pi} - a community-driven site for Raspberry devices \li \l{http://qt-project.org/wiki/Category:Devices}{Devices} - a list of other devices and chipsets diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 7cc80ea4..35bc91fb 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -77,6 +77,31 @@ visit the following page: \li \l{Qt for Linux/X11 - Building from Source} \endlist +\section1 Embedded Linux + +\list +\li \l{Qt for Embedded Linux#Configuring for a Specific Device} + {Qt for Embedded Linux - Building from Source} +\endlist + +\section1 Android + +\list +\li \l {Building Qt 5 for Android}{Qt for Android - Building from Source} +\endlist + +\section1 iOS + +\list +\li \l {Qt for iOS - Building from Source} +\endlist + +\section1 WinRT + +\list +\li \l {Qt for WinRT#Building from source}{Qt for WinRT - Building from Source} +\endlist + \section1 Windows CE \list diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc index b3bea824..969855b6 100644 --- a/doc/src/platforms/ios.qdoc +++ b/doc/src/platforms/ios.qdoc @@ -54,21 +54,14 @@ \section2 Setting Up the Development Environment - You have two options to set up the Qt development environment: - - \list 1 - \li through the \e{Qt Installers} - downloads and installs Qt - \li through the \e{Qt sources}. - \endlist - - You can download the Qt 5 installers and sources from the \l Downloads page. - For more information, visit the \l{Getting Started with Qt} page. + You can download the Qt 5 installers from the \l Downloads page. + For more information, see \l{Getting Started with Qt}. \note Qt Enterprise packages are available from the \l{Try Qt Enterprise} page. Qt for iOS is also available as part of the Qt Mobile Edition, see \l{Qt Enterprise}{qt.digia.com} for details. - Regardless of which approach you choose, you first need to install + Before installing Qt, you first need to install Xcode. You will find it in the App Store \l{Xcode}{here}. For running Qt applications in the simulator that comes with Xcode, this is all you need. However, for running applications on a @@ -78,30 +71,10 @@ developer certificates and provisioning profiles. The easiest solution is to use a profile that takes any App ID (a \c *). - Before building Qt or any Qt applications, you should test that Xcode + Before building any Qt applications, you should test that Xcode is set up correctly, for example, by running one of the standard Xcode application templates on your device. - \section3 Building From Source - - 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 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: - - \badcode - > ./configure -xplatform macx-ios-clang -release - \endcode - - Then simply run \c{make}. - - \note A default build will include both simulator and device - libraries. If you want to build for a single target, use the \c - -sdk argument with either \c iphoneos or \c iphonesimulator. - \section2 Building Applications From the Command Line As mentioned previously, the development workflow on iOS consists @@ -155,9 +128,40 @@ The following topics provide more details about Qt for iOS: \list \li \l {Porting to iOS}{Porting a Qt Quick Application} - \li \l {Platform Notes -iOS}{Platform Notes} + \li \l {Platform Notes - iOS}{Platform Notes} + \li \l {Qt for iOS - Building from Source} \endlist */ + +/*! + \page building-from-source-ios.html + \title Qt for iOS - Building from Source + \brief Provides instructions to build Qt from source for iOS platform. + + Building \l {Qt for iOS} from sources requires \l Xcode with + command-line tools installed. This can be done within Xcode from + \gui Preferences > \gui Downloads > \gui Components > + \gui {Command Line Tools}. + + Qt 5 sources can be obtained either by cloning the repositories or + downloading the source package(s). + + We can then configure and build Qt. This is done from the Qt 5 top + directory: + + \badcode + > ./configure -xplatform macx-ios-clang -release + \endcode + + For other configure options, see \l{Qt Configure Options}. + + Then, simply run \c{make}. + + \note A default build will include both simulator and device + libraries. If you want to build for a single target, use the \c + -sdk argument with either \c iphoneos or \c iphonesimulator. +*/ + /*! \page porting-to-ios.html \title Porting to iOS |