diff options
-rw-r--r-- | doc/src/external-resources.qdoc | 11 | ||||
-rw-r--r-- | doc/src/getting-started/gettingstarted.qdoc | 29 | ||||
-rw-r--r-- | doc/src/platforms/android.qdoc | 28 |
3 files changed, 38 insertions, 30 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index d0ddf689..2f516dde 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -173,6 +173,12 @@ \externalpage http://doc.qt.io/qtcreator/creator-configuring.html \title Configuring Qt Creator */ + +/*! + \externalpage http://doc.qt.io/qtcreator/creator-deploying-android.html#specifying-settings-for-packages + \title Android APK +*/ + /*! \externalpage http://doc.qt.io/qtcreator/creator-build-example-application.html \title Building and Running Example @@ -277,3 +283,8 @@ \externalpage http://doc.qt.io/QtSupportedPlatforms/index.html \title Officially Supported Platforms */ + +/*! + \externalpage http://www.qt.io/qt-account/ + \title Qt Account +*/ diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc index 960a1582..64ac6372 100644 --- a/doc/src/getting-started/gettingstarted.qdoc +++ b/doc/src/getting-started/gettingstarted.qdoc @@ -30,11 +30,14 @@ \title Getting Started with Qt \brief A quick guide for developers - Qt Framework and tools can be installed using an online installer, - offline installers, or by building the source packages yourself. - The \e{online installers} give you the option to download or install only - certain modules or add-ons. An \e{offline installer} is a single package - which contains all of Qt and Add-Ons relevant for a target platform. + You can install the Qt Framework and tools by using an online or offline + installer or by building the source packages yourself. In the + \e{online installer}, you can select the Qt versions, tools, and Add-On + components to download and install depending on the license attached to your + \l{Qt Account}. + + An \e{offline installer} is a single package that contains all of Qt and + Add-Ons relevant for a target platform. You can download Qt 5 installers from the \l Downloads page. @@ -52,12 +55,18 @@ \endlist After downloading, start the installer like any executable on the - development platform. Select the components that you want to install and - follow the instructions of the installation program to complete the - installation. + development platform. + + To run the installer, you need a Qt Account. You can use your Qt Account + credentials to sign-in to all Qt services, including the forums and wiki. + If you do not already have a Qt Account, you can create one during the + installation process. + + To complete the installation, select the components that you want to install + and follow the instructions of the installation program. - Use the Maintenance Tool under \e{<install_dir>} to add, update, or remove - installed components. + Use the Maintenance Tool under \e{<install_dir>} to add components and to + update or remove installed components. \section2 Platform Requirements diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc index ac0f0510..56be779a 100644 --- a/doc/src/platforms/android.qdoc +++ b/doc/src/platforms/android.qdoc @@ -253,18 +253,6 @@ application to Android using the qrc approach: \note QML documents can refer to the contents in qrc files using the relative path to the document. Such references do not require the "\c{qrc:}" or "\c{:/}" prefix. - \li Update the "Run" settings for your project as described in the - \l{Qt Creator: Specifying Run Settings} - - \note You can change the default settings for application icons and - identifier. - \li If your application uses imports or plugins which depend on special Qt - modules, these Qt modules should be added to the .pro file. For example, if - your application uses the \l{Qt Multimedia} import in QML, you should add - the following to your .pro file: - \code - QT += multimedia - \endcode \li Save the changes to your project and run the application. \endlist @@ -326,9 +314,9 @@ the APK: \li Run \c{make build_libs} to build the \c libcrypto and \c libssl shared libraries. - \li Open your Qt project using Qt Creator and update the - "Deployment Configuration" under run settings to add \e libcrypto and - \e libssl as additional libraries required for your project. + \li Open your Qt project using Qt Creator and update the "Build Android APK" + settings to add \e libcrypto and \e libssl as additional libraries for + your project. \li Run your application to see it running on the device. \endlist @@ -358,10 +346,9 @@ on Google Play: \li Open your application project using Qt Creator v3.0 or later and change its \uicontrol Build settings to build release version. - \li Open \uicontrol Run settings of your project and select - \uicontrol {Create AndroidManifest.xml}. Qt Creator adds the manifest XML - based on the application's \e .pro file and opens it in \uicontrol General - mode. + \li Select \uicontrol {Create Templates} under \uicontrol Build settings to + create the template files such as \e AndroidManifest.xml and other + resources. \note You can edit the \e AndroidManifest.xml in \uicontrol General or \uicontrol {XML Source} mode. @@ -388,7 +375,8 @@ on Google Play: information on the manifest XML format, see \l{Android: App Manifest}. \li Set up a \uicontrol keystore to sign the \e .apk. You can create a new - keystore if you do not have one. + keystore if you do not have one. For more details, see + \l{Android APK}{QtCreator: Specifying Settings for Packages}. \li Select \uicontrol{Open package location after build} and run your application to build the \e .apk. Qt Creator builds the \e .apk and opens the |