diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 7b5ec0c5f4e1396adb354e3be872ec9a45afc083..d28fa35c61a447154cb2c8088c9c4f13045b7ba5 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -25,6 +25,11 @@ ** ****************************************************************************/ +/*! + \externalpage http://qt-project.org/wiki/Building_Qt_5_from_Git + \title Building Qt 5 From Git +*/ + /*! \externalpage http://qt-project.org/contribute \title Contributing to Qt diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc index 45c54c34e6c1024d657a5452b79d1d2c9494b608..71105d4cc9b1c56bb95ab248b1c11b672b5b633d 100644 --- a/doc/src/platforms/ios.qdoc +++ b/doc/src/platforms/ios.qdoc @@ -26,36 +26,73 @@ ****************************************************************************/ /*! -\page ios_support.html -\title iOS -\brief Provides insight into the Qt iOS port and how to use it. - -The Qt for iOS preview should enable you to run Qt applications on iOS devices. -Although it is a preview release, you can a do a lot with it. Here is a list of -items supported: - -\list - \li Widgets - \li Graphics View - \li QtQuick 1 - \li OpenGL - \li Touch and Orientation events -\endlist - -\section1 Getting Started - -To get started with this solution, do the following: -\list 1 - \li Setup Xcode for development (acquire certificates, configure devices). Test and deploy one of the standard Xcode app templates to ensure that it works. - \li Build QtBase and other modules you intend to use, for device or simulator. Note that Qt 5 does not support multi-architecture builds like Qt 4 does. - \code - > ./configure -xplatform unsupported/macx-ios-clang -developer-build -nomake examples -nomake tests -release [-sdk iphonesimulator] - - > make - \endcode - \endlist - -To check whether your environment is configured, try running the simple demo application. + \page ios_support.html + \title iOS + \brief Provides insight into Qt's iOS port and how to use it. + + Qt's iOS port supports the following: + + \list + \li Widgets + \li Graphics View + \li QtQuick 1 + \li OpenGL + \li Touch and Orientation events + \endlist + + \section1 Getting Started + + Development and deployment is done using Xcode. The supported + workflow is to maintain a \c .pro file based project, export it to + Xcode (and re-export when the project setup changes), and then + build and deploy using Xcode. + + To set up your development environment, do the following: + + \list 1 + \li Setup Xcode for development (acquire certificates, + configure devices). Test and deploy one of the standard + Xcode app templates to ensure that it works. + \li Build the modules you intend to use, for + device or simulator. Build instructions for Qt 5 is found + \l{Building Qt 5 From Git}{here}. + However, you don't need to build all of Qt 5. + After cloning Qt 5, enter the qtbase directory and + build from the command line like this: + + \code + > ./configure -xplatform unsupported/macx-ios-clang -developer-build -release [-sdk iphonesimulator] + + > make + \endcode + + If you want the latest sources, you can checkout the + \c dev branch before building. + + You also need to build the + \l{Qt Script} and \l{Qt Quick 1} modules if you + intend to use \l{Qt Quick 1}. From the Qt 5 top + directory, type: + + \code + > cd qtscript; ../qtbase/bin/qmake; make; cd .. + > cd qtquick1; ../qtbase/bin/qmake; make; cd .. + \endcode + \endlist + + To check whether your environment is configured, try running the + simple demo application. It lives in the \c + {git://github.com/msorvig/qt-ios-demo.git} repository. Here is how + you build it: + + \list 1 + \li ../qtbase/bin/qmake + \li open \c {qt-ios-demo.xcodeproj} in Xcode and build it like + any other Xcode project. + \endlist + + When you develop your own applications, you follow the same + procedure. */