diff options
5 files changed, 5 insertions, 115 deletions
diff --git a/doc/src/getting-started/create-your-first-applications.qdoc b/doc/src/getting-started/create-your-first-applications.qdoc index 846e28770..a83853523 100644 --- a/doc/src/getting-started/create-your-first-applications.qdoc +++ b/doc/src/getting-started/create-your-first-applications.qdoc @@ -57,10 +57,7 @@ \li Mobile Devices \li \l{Qt Creator: Creating a Mobile Application} {Qt Creator: Accelbubble} - \li \list - \li \l{Qt for Android Examples} - \li \l{Qt for iOS Examples} - \endlist + \li \l[Qt Examples And Tutorials]{Mobile}{Mobile Examples} \row \li Embedded Devices \li \list diff --git a/doc/src/platforms/android/android-deploying-application.qdoc b/doc/src/platforms/android/android-deploying-application.qdoc index 8e5c04a73..435ea3afe 100644 --- a/doc/src/platforms/android/android-deploying-application.qdoc +++ b/doc/src/platforms/android/android-deploying-application.qdoc @@ -6,8 +6,8 @@ \title Deploying an Application on Android \brief The technical steps required to deploy a Qt application on Android. \ingroup androidplatform - \previouspage examples-android.html \nextpage android-openssl-support.html + \previouspage porting-to-android.html This article describes the technical steps required to deploy a Qt diff --git a/doc/src/platforms/android/android.qdoc b/doc/src/platforms/android/android.qdoc index e1295f057..fb12b928c 100644 --- a/doc/src/platforms/android/android.qdoc +++ b/doc/src/platforms/android/android.qdoc @@ -262,7 +262,8 @@ \section3 Testing Your Setup Now you can test your development setup by running the examples shipped with the - Qt installation. For more information, see \l {Qt for Android Examples}. + Qt installation. For more information, see + \l[Qt Examples And Tutorials]{Mobile}{Mobile Examples}. To develop a simple application from scratch, see \l {Qt Creator: Creating a Mobile Application}. diff --git a/doc/src/platforms/android/examples-android.qdoc b/doc/src/platforms/android/examples-android.qdoc deleted file mode 100644 index af1fde6ae..000000000 --- a/doc/src/platforms/android/examples-android.qdoc +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \page examples-android.html - \title Qt for Android Examples - \brief A list of selected Qt Examples for Android. - \ingroup androidplatform - \previouspage porting-to-android.html - \nextpage deployment-android.html - - This page lists Qt examples that have been tested to run on - \l{Qt for Android}{Android}. However, most \l{Qt Examples and Tutorials} - {Qt Examples} can be run on Android even though they are not listed here. - - \section1 Running the Examples - - To run examples from \l{Qt Creator Manual}{Qt Creator}, select \uicontrol - Welcome > \uicontrol Examples, and then select an installed Qt for Android - to filter the examples that have been tested to run on Android. For more - information, see \l{Qt Creator: Building and Running an Example} - {Building and Running an Example}. - - \section1 Essentials - - The following sections describe how to get started with developing - applications for Android: - - \list - \li \l{Getting Started with Qt for Android} - \li \l{Qt Creator: Creating a Mobile Application} - \li \l{Qt Creator: Deploying Applications to Android Devices} - \li \l{Publishing to Google Play} - \li \l{Porting to Android} - \li \l{Adding OpenSSL Support for Android} - \li \l{Qt for Android - Building from Source} - \endlist - - \section1 Qt Quick and QML Examples for Android - - The following Qt Quick and QML examples are useful when developing - applications for Android. For a full list of Qt Quick examples - including beginner-level tutorials, see \l{Qt Quick Examples and Tutorials}. - - \div {class="multi-column"} - \div {class="doc-column"} - \b{Touch and Key Interaction} - \list - \li \l{Qt Quick Examples - Pointer Handlers}{Pointer Handlers} - \li \l{Qt Quick Examples - Key Interaction}{Key Interaction} - \endlist - \enddiv - \div {class="doc-column"} - \b{Images, Animation, and Layout} - \list - \li \l{Qt Quick Examples - Image Elements}{Image Elements} - \li \l{Qt Quick Examples - Text}{Text} - \li \l{Qt Quick Examples - Animation}{Animation} - \li \l{Qt Quick Examples - Canvas}{Canvas} - \li \l{Qt Quick Examples - Positioners}{Positioners} - \endlist - \enddiv - \div {class="doc-column"} - \b{Scenegraph} - \list - \li \l{Scene Graph - Custom Geometry}{Custom Geometry} - \li \l{Scene Graph - Graph}{Graph} - \li \l{Scene Graph - OpenGL Under QML}{OpenGL Under QML} - \li \l{Scene Graph - Painted Item}{Painted Item} - \endlist - \enddiv - \div {class="doc-column"} - \b{Particles and Effects} - \list - \li \l{Qt Quick Particles Examples - Emitters}{Emitters} (Particles) - \li \l{Qt Quick Particles Examples - Affectors}{Affectors} - \li \l{Qt Quick Particles Examples - System}{System} - \li \l{Qt Quick Particles Examples - Image Particles}{Image Particles} - \li \l{Qt Quick Examples - Shader Effects}{Shader Effects} - \endlist - \enddiv - \div {class="doc-column"} - \b{Multimedia} - \list - \li \l{Media Player Example} - \li \l{Camera Example} - \li \l{QML Media Player Example} - \li \l{QML Video Recorder} - \endlist - \enddiv - \omit \\! Not part of Qt 6.0 - \div {class="doc-column"} - \b{Location} - \list - \li \l{Map Viewer (QML)}{Map Viewer Example} - \li \l{Places Map (QML)}{Places Map Example} - \li \l{Plane Spotter (QML)}{Plane Spotter Example} - \endlist - \enddiv - \endomit - \div {class="doc-column"} - \b{In-App Purchasing} - \list - \li \l{In-App purchasing demo}{Qt Hangman (In-App Purchasing)} - \endlist - \enddiv - \enddiv -*/ diff --git a/doc/src/platforms/android/porting-to-android.qdoc b/doc/src/platforms/android/porting-to-android.qdoc index 9ef1fc933..9d4dd7ec9 100644 --- a/doc/src/platforms/android/porting-to-android.qdoc +++ b/doc/src/platforms/android/porting-to-android.qdoc @@ -7,7 +7,7 @@ \brief Provides instructions to port your existing Qt application to Android. \ingroup androidplatform \previouspage android-building.html -\nextpage examples-android.html +\nextpage deployment-android.html Most Qt applications should be portable to Android with ease, unless they depend on a specific hardware or software feature not supported by Android. |