Update Mobile Development overview

Qt 6.0 doesn't support many of the Qt 5 mobile APIs
and we need to re-emphasize the other parts of the
mobile story.

Task-number: QTBUG-87158
Change-Id: I08fb6d1941f8229d2f66971eddabe9f964f9ad8a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

5 files changed, 33 insertions, 74 deletions

diff --git a/doc/config/style/qt5-sidebar.html b/doc/config/style/qt5-sidebar.html
index 66d2c56f..8f6510b0 100644
--- a/doc/config/style/qt5-sidebar.html
+++ b/doc/config/style/qt5-sidebar.html
@@ -37,7 +37,7 @@
         <li><a href="topics-data-storage.html">Data Storage</a></li>
         <li><a href="topics-network-connectivity.html">Networking and Connectivity</a></li>
         <li><a href="topics-graphics.html">Graphics</a></li>
-        <li><a href="mobiledevelopment.html">Mobile APIs</a></li>
+        <li><a href="mobiledevelopment.html">Mobile Development</a></li>
         <li><a href="qmlapplications.html">QML Applications</a></li>
         <li><a href="platform-integration.html">Platform Integration</a></li>
     </ul>
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 9cad3c2c..8f018d37 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -110,7 +110,7 @@
                 \li \l{Networking and Connectivity}
                 \li \l{Graphics}
                 \li \l{Integrating Web Content}{Web Content}
-                \li \l{Mobile APIs}
+                \li \l{Mobile Development}
                 \li \l{QML Applications}
                 \li \l{Platform Integration}
                 \endlist
diff --git a/doc/src/mobile.qdoc b/doc/src/mobile.qdoc
index 9a2874dc..cd73835d 100644
--- a/doc/src/mobile.qdoc
+++ b/doc/src/mobile.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -27,14 +27,10 @@
 
 /*!
     \page mobiledevelopment.html
-    \title Mobile APIs
-    \brief APIs for accessing mobile hardware
+    \title Mobile Development
+    \brief Development for mobile devices.
 
-    New in Qt 5 are APIs for mobile platforms. These APIs access various
-    hardware and mobile features. There are also APIs for extending support
-    to other devices and platforms.
-
-    \section2 Supported Mobile Platforms
+    Qt supports development and deployment of mobile applications.
 
     The following pages contain information about setting up Qt Creator and
     how to get started with the mobile platforms:
@@ -43,68 +39,47 @@
         \li \l{Qt for iOS}{iOS}
     \endlist
 
-    \section1 Sensors
-
-    The Qt Sensors module's APIs allow access to various hardware
-    sensors. Accelerometers, light sensors, compass, and gyroscope sensors
-    are one of the many types of sensors supported by the QML and C++ APIs.
+    \section1 Android
 
-    \list
-    \li \l{Qt Sensors}
-    \endlist
+    There is support for Android development in Qt 6. With Qt Creator, you can
+    connect to devices, develop, test, and package Android applications.
 
-    \section1 Positioning
-
-    Accessing location information through Global Positioning System (GPS) or
-    Cell ID positioning is available through the positioning APIs from the Qt
-    Positioning module. Additionally, devices which use NMEA protocols can be
-    used as a source.
+    \include supported-platforms.qdocinc android
 
     \list
-    \li \l{Qt Positioning}
+        \li \l{Qt for Android}
+        \li \l{Qt for Android Examples}{Android Examples}
     \endlist
 
-    \section1 Location
+    \section1 Apple Platforms - iOS, tvOS, and watchOS
+
+    There is support for various Apple mobile devices such as iPad,
+    iPhone, Apple TV, and Apple Watch. Qt Creator supplements \l Xcode for
+    development and deployment.
 
-    The Qt Location module's API allows access to map, navigation, and place data.
-    It is possible to interact with tile maps using gestures to pan, flick, and
-    zoom. Additional information such as routes or places may be displayed on the
-    map.
+    \include supported-platforms.qdocinc ios
 
     \list
-    \li \l{Qt Location}
+        \li \l{Qt for iOS}
+        \li \l{Qt for iOS Examples}{iOS Examples}
     \endlist
 
-    \section1 Bluetooth
+    \section1 Tools for Mobile Development
 
-    The Qt Bluetooth module's APIs allows access to Bluetooth-enabled devices.
-    There are APIs for scanning Bluetooth devices and sharing data among
-    devices. The APIs have support for radio-frequency communication (RFCOMM)
-    and OBEX Object Push Profile (OPP) protocols.
+    \l{Qt Creator} is the IDE for Qt development. Qt Creator creates project
+    files, test and debug code, and connects to mobile devices. For Android, Qt
+    Creator can sign and package APK files, ready for publishing to Google Play.
+    \l Xcode is necessary for development on Apple platforms and Qt Creator can
+    create project files and connect to Apple devices for testing.
 
-    \list
-    \li \l{Qt Bluetooth}
-    \endlist
-
-    \section1 NFC
+    \section2 Design Tools for Mobile
 
-    Near field communication (NFC) support is provided by the Qt NFC module. The
-    QML and C++ APIs sets up communication between NFC Forum Tags and NFC Forum
-    Devices through the of NFC Logical Link Control Protocol (LLCP).
+    Design tools aid UI development by allowing designers to create layouts and
+    animation that can be converted into Qt compatible formats. 2D and 3D assets
+    created from design software can be integrated into Qt applications.
 
     \list
-    \li \l{Qt NFC}
+        \li \l{Qt 3D Studio Manual}{Qt 3D Studio}
+        \li \l{Qt Design Studio}{Qt Design Studio}
     \endlist
-
-   \section1 In-App Purchasing
-
-   The Qt Purchasing module enables mobile developers to generate revenue from
-   their applications on Android and iOS platforms. The module provides C++ and
-   QML alternatives to support the In-App purchasing use case in Qt
-   applications.
-
-   \list
-    \li \l{Qt Purchasing}
-   \endlist
-
 */
diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc
index 0e0030de..455643b9 100644
--- a/doc/src/qmlapp/applicationdevelopers.qdoc
+++ b/doc/src/qmlapp/applicationdevelopers.qdoc
@@ -151,22 +151,6 @@ in C++.
     \endlist
 \endlist
 
-\section1 Mobile Devices
-
-Several Qt modules provide QML APIs for networked and mobile devices. The QML
-types provide access to the Bluetooth, Near-Field Communications (NFC), and
-GPS-enabled devices.
-
-\list
-\li \l{Qt Positioning}
-\li \l{Qt Location}
-\li \l{Qt Bluetooth}
-\li \l{Qt NFC}
-\endlist
-
-For more information, visit the \l{Networking and Connectivity} and
-\l{Mobile APIs} pages.
-
 \section1 Code Samples and Demos
 
 To learn more about uses of QML code, there are several code samples which show
diff --git a/doc/src/topics.qdoc b/doc/src/topics.qdoc
index 25999b34..53d17a5d 100644
--- a/doc/src/topics.qdoc
+++ b/doc/src/topics.qdoc
@@ -42,7 +42,7 @@ functionality and can be used as a starting point for learning how to to get the
 \li \l{Networking and Connectivity}
 \li \l{Graphics}
 \li \l{Integrating Web Content}
-\li \l{Mobile APIs}
+\li \l{Mobile Development}
 \li \l{QML Applications}
 \li \l{Platform Integration}
 \endlist