Remove QtAndroidExtras module and add note about its state in Qt 6HEADdev

The JNI utilities (i.e. QJniObject, QJniEnvironment) are already under
qtbase as public APIs.

Permission handling is now under QCoreApplication::{check,request}Permission
and QPermission namespace.

Some of the QtAndroid namespace functions are now under QNativeInterface's
QAndroidApplication, this includes:
* sdkVersion()
* hideSplashScreen()
* context() and isActivityContext()
* runOnAndroidMainThread()

The remaining APIs are now moved as private APIs under qtbase
ee05af296f65e240f64db6470cdddafbddbf2fa3. That is until we add
new cross-platform APIs to replace their functionalities like
Intents handling, starting activites and working with Services.

Task-number: QTBUG-83251
Task-number: QTBUG-84382
Pick-to: 6.2
Change-Id: Id077f8cbbe223a987916f737fad6088fb58e470d
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>

17 files changed, 0 insertions, 536 deletions

diff --git a/src/androidextras/doc/QtAndroidExtras/QAndroidJniObject b/src/androidextras/doc/QtAndroidExtras/QAndroidJniObject
deleted file mode 100644
index b96916d..0000000
--- a/src/androidextras/doc/QtAndroidExtras/QAndroidJniObject
+++ /dev/null
@@ -1 +0,0 @@
-#include "qandroidjniobject.h"
diff --git a/src/androidextras/doc/QtAndroidExtras/jni.h b/src/androidextras/doc/QtAndroidExtras/jni.h
deleted file mode 100644
index 9013345..0000000
--- a/src/androidextras/doc/QtAndroidExtras/jni.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/* Dummy declarations passed to clang when generating the docs */
-
-#ifndef JNI_H
-#define JNI_H
-
-struct JNIEnv_;
-struct JavaVM_;
-typedef JNIEnv_ JNIEnv;
-typedef JavaVM_ JavaVM;
-typedef int jclass;
-typedef char jobject;
-
-#endif
diff --git a/src/androidextras/doc/QtAndroidExtras/qandroidextrasglobal.h b/src/androidextras/doc/QtAndroidExtras/qandroidextrasglobal.h
deleted file mode 100644
index 9000f4e..0000000
--- a/src/androidextras/doc/QtAndroidExtras/qandroidextrasglobal.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "../../qandroidextrasglobal.h"
-#include "QtCore/qvariant.h"
diff --git a/src/androidextras/doc/QtAndroidExtras/qandroidjniobject.h b/src/androidextras/doc/QtAndroidExtras/qandroidjniobject.h
deleted file mode 100644
index 7f58978..0000000
--- a/src/androidextras/doc/QtAndroidExtras/qandroidjniobject.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../jni/qandroidjniobject.h"
diff --git a/src/androidextras/doc/QtAndroidExtrasDoc b/src/androidextras/doc/QtAndroidExtrasDoc
deleted file mode 100644
index 2294259..0000000
--- a/src/androidextras/doc/QtAndroidExtrasDoc
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "qandroidextrasglobal.h"
-#include "qandroidactivityresultreceiver.h"
-#include "qandroidbinder.h"
-#include "qandroidfunctions.h"
-#include "qandroidintent.h"
-#include "qandroidjnienvironment.h"
-#include "qandroidjniobject.h"
-#include "qandroidparcel.h"
-#include "qandroidserviceconnection.h"
-#include "qandroidservice.h"
diff --git a/src/androidextras/doc/images/androidservices.png b/src/androidextras/doc/images/androidservices.png
deleted file mode 100644
index 5c837f6..0000000
--- a/src/androidextras/doc/images/androidservices.png
+++ /dev/null
diff --git a/src/androidextras/doc/images/customactivity.png b/src/androidextras/doc/images/customactivity.png
deleted file mode 100644
index 4b01a0a..0000000
--- a/src/androidextras/doc/images/customactivity.png
+++ /dev/null
diff --git a/src/androidextras/doc/images/jnimessenger.png b/src/androidextras/doc/images/jnimessenger.png
deleted file mode 100644
index 1cb4efd..0000000
--- a/src/androidextras/doc/images/jnimessenger.png
+++ /dev/null
diff --git a/src/androidextras/doc/images/musiclist.png b/src/androidextras/doc/images/musiclist.png
deleted file mode 100644
index cc37613..0000000
--- a/src/androidextras/doc/images/musiclist.png
+++ /dev/null
diff --git a/src/androidextras/doc/images/notification.png b/src/androidextras/doc/images/notification.png
deleted file mode 100644
index 6d7dba6..0000000
--- a/src/androidextras/doc/images/notification.png
+++ /dev/null
diff --git a/src/androidextras/doc/qtandroidextras.qdocconf b/src/androidextras/doc/qtandroidextras.qdocconf
deleted file mode 100644
index 4b9c77a..0000000
--- a/src/androidextras/doc/qtandroidextras.qdocconf
+++ /dev/null
@@ -1,52 +0,0 @@
-include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-include($QT_INSTALL_DOCS/config/exampleurl-qtandroidextras.qdocconf)
-
-Cpp.ignoretokens += Q_ANDROIDEXTRAS_EXPORT
-# dummy module header for clang, found under doc/
-moduleheader = QtAndroidExtrasDoc
-
-# pass include paths to clang
-includepaths += -I . \
-                -I .. \
-                -I ../android \
-                -I ../jni \
-                -I ./QtAndroidExtras
-
-project = QtAndroidExtras
-description = Qt Android Extras Reference Documentation
-version = $QT_VERSION
-
-qhp.projects = QtAndroidExtras
-
-qhp.QtAndroidExtras.file = qtandroidextras.qhp
-qhp.QtAndroidExtras.namespace = org.qt-project.qtandroidextras.$QT_VERSION_TAG
-qhp.QtAndroidExtras.virtualFolder = qtandroidextras
-qhp.QtAndroidExtras.indexTitle = Qt Android Extras
-qhp.QtAndroidExtras.indexRoot =
-
-qhp.QtAndroidExtras.filterAttributes = qtandroidextras $QT_VERSION qtrefdoc
-qhp.QtAndroidExtras.customFilters.Qt.name = QtAndroidExtras $QT_VERSION
-qhp.QtAndroidExtras.customFilters.Qt.filterAttributes = qtandroidextras $QT_VERSION
-
-qhp.QtAndroidExtras.subprojects = classes examples
-qhp.QtAndroidExtras.subprojects.classes.title = C++ Classes and Namespaces
-qhp.QtAndroidExtras.subprojects.classes.indexTitle = Qt Android Extras C++ Classes
-qhp.QtAndroidExtras.subprojects.classes.selectors = class function namespace fake:headerfile
-qhp.QtAndroidExtras.subprojects.classes.sortPages = true
-qhp.QtAndroidExtras.subprojects.examples.title = Examples
-qhp.QtAndroidExtras.subprojects.examples.indexTitle = Qt Android Extras Examples
-qhp.QtAndroidExtras.subprojects.examples.selectors = fake:example
-
-depends += qtcore qtdoc qtqml qtquick qtremoteobjects
-headerdirs += ..
-sourcedirs += ..
-exampledirs += ../../../examples/androidextras \
-               snippets
-examples.fileextensions += *.java
-
-# Specify example install dir under QT_INSTALL_EXAMPLES
-examplesinstallpath = androidextras
-
-imagedirs += images
-navigation.landingpage = "Qt Android Extras"
-navigation.cppclassespage = "Qt Android Extras C++ Classes"
diff --git a/src/androidextras/doc/snippets/code/src_androidextras_qandroidjnienvironment.cpp b/src/androidextras/doc/snippets/code/src_androidextras_qandroidjnienvironment.cpp
deleted file mode 100644
index 1b404d5..0000000
--- a/src/androidextras/doc/snippets/code/src_androidextras_qandroidjnienvironment.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
- **
- ** Copyright (C) 2015 The Qt Company Ltd.
- ** Contact: http://www.qt.io/licensing/
- **
- ** This file is part of the documentation of the Qt Toolkit.
- **
- ** $QT_BEGIN_LICENSE:BSD$
- ** Commercial License Usage
- ** Licensees holding valid commercial Qt licenses may use this file in
- ** accordance with the commercial license agreement provided with the
- ** Software or, alternatively, in accordance with the terms contained in
- ** a written agreement between you and The Qt Company. For licensing terms
- ** and conditions see https://www.qt.io/terms-conditions. For further
- ** information use the contact form at https://www.qt.io/contact-us.
- **
- ** BSD License Usage
- ** Alternatively, you may use this file under the terms of the BSD license
- ** as follows:
- **
- ** "Redistribution and use in source and binary forms, with or without
- ** modification, are permitted provided that the following conditions are
- ** met:
- **   * Redistributions of source code must retain the above copyright
- **     notice, this list of conditions and the following disclaimer.
- **   * Redistributions in binary form must reproduce the above copyright
- **     notice, this list of conditions and the following disclaimer in
- **     the documentation and/or other materials provided with the
- **     distribution.
- **   * Neither the name of The Qt Company Ltd nor the names of its
- **     contributors may be used to endorse or promote products derived
- **     from this software without specific prior written permission.
- **
- **
- ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
- **
- ** $QT_END_LICENSE$
- **
- ****************************************************************************/
-
-//! [Create QAndroidJniEnvironment]
-
-bool exceptionCheck()
-{
-    /*
-      The QAndroidJniEnvironment attaches the current thread to the JavaVM on
-      creation and detach when it goes out of scope.
-     */
-    QAndroidJniEnvironment qjniEnv;
-    return qjniEnv->ExceptionCheck();
-}
-//! [Create QAndroidJniEnvironment]
diff --git a/src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp b/src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp
deleted file mode 100644
index 96ae1a9..0000000
--- a/src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
- **
- ** Copyright (C) 2015 The Qt Company Ltd.
- ** Contact: http://www.qt.io/licensing/
- **
- ** This file is part of the documentation of the Qt Toolkit.
- **
- ** $QT_BEGIN_LICENSE:BSD$
- ** Commercial License Usage
- ** Licensees holding valid commercial Qt licenses may use this file in
- ** accordance with the commercial license agreement provided with the
- ** Software or, alternatively, in accordance with the terms contained in
- ** a written agreement between you and The Qt Company. For licensing terms
- ** and conditions see https://www.qt.io/terms-conditions. For further
- ** information use the contact form at https://www.qt.io/contact-us.
- **
- ** BSD License Usage
- ** Alternatively, you may use this file under the terms of the BSD license
- ** as follows:
- **
- ** "Redistribution and use in source and binary forms, with or without
- ** modification, are permitted provided that the following conditions are
- ** met:
- **   * Redistributions of source code must retain the above copyright
- **     notice, this list of conditions and the following disclaimer.
- **   * Redistributions in binary form must reproduce the above copyright
- **     notice, this list of conditions and the following disclaimer in
- **     the documentation and/or other materials provided with the
- **     distribution.
- **   * Neither the name of The Qt Company Ltd nor the names of its
- **     contributors may be used to endorse or promote products derived
- **     from this software without specific prior written permission.
- **
- **
- ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
- **
- ** $QT_END_LICENSE$
- **
- ****************************************************************************/
-
-//! [Working with lists]
-QStringList getTrackTitles(const QAndroidJniObject &album) {
-    QStringList stringList;
-    QAndroidJniObject list = album.callObjectMethod("getTitles",
-                                                      "()Ljava/util/List;");
-
-    if (list.isValid()) {
-        const int size = list.callMethod<jint>("size");
-        for (int i = 0; i < size; ++i) {
-            QAndroidJniObject title = list.callObjectMethod("get", "(I)Ljava/lang/Object;", i);
-            stringList.append(title.toString());
-        }
-    }
-    return stringList;
-}
-//! [Working with lists]
-
-//! [QAndroidJniObject scope]
-void functionScope()
-{
-    QString helloString("Hello");
-    jstring myJString = 0;
-    {
-        QAndroidJniObject string = QAndroidJniObject::fromString(helloString);
-        myJString = string.object<jstring>();
-    }
-
-   // Ops! myJString is no longer valid.
-}
-//! [QAndroidJniObject scope]
-
-//! [Check for exceptions]
-void functionException()
-{
-    QAndroidJniObject myString = QAndroidJniObject::fromString("Hello");
-    jchar c = myString.callMethod<jchar>("charAt", "(I)C", 1000);
-    QAndroidJniEnvironment env;
-    if (env->ExceptionCheck()) {
-        // Handle exception here.
-        env->ExceptionClear();
-    }
-}
-//! [Check for exceptions]
-
-//! [Registering native methods]
-static void fromJavaOne(JNIEnv *env, jobject thiz, jint x)
-{
-    Q_UNUSED(env);
-    Q_UNUSED(thiz);
-    qDebug() << x << "< 100";
-}
-
-static void fromJavaTwo(JNIEnv *env, jobject thiz, jint x)
-{
-    Q_UNUSED(env);
-    Q_UNUSED(thiz);
-    qDebug() << x << ">= 100";
-}
-
-void registerNativeMethods() {
-    JNINativeMethod methods[] {{"callNativeOne", "(I)V", reinterpret_cast<void *>(fromJavaOne)},
-                               {"callNativeTwo", "(I)V", reinterpret_cast<void *>(fromJavaTwo)}};
-
-    QAndroidJniObject javaClass("my/java/project/FooJavaClass");
-    QAndroidJniEnvironment env;
-    jclass objectClass = env->GetObjectClass(javaClass.object<jobject>());
-    env->RegisterNatives(objectClass,
-                         methods,
-                         sizeof(methods) / sizeof(methods[0]));
-    env->DeleteLocalRef(objectClass);
-}
-
-void foo()
-{
-    QAndroidJniObject::callStaticMethod<void>("my/java/project/FooJavaClass", "foo", "(I)V", 10);  // Output: 10 < 100
-    QAndroidJniObject::callStaticMethod<void>("my/java/project/FooJavaClass", "foo", "(I)V", 100); // Output: 100 >= 100
-}
-
-//! [Registering native methods]
-
-//! [Java native methods]
-class FooJavaClass
-{
-    public static void foo(int x)
-    {
-        if (x < 100)
-            callNativeOne(x);
-        else
-            callNativeTwo(x);
-    }
-
-private static native void callNativeOne(int x);
-private static native void callNativeTwo(int x);
-
-}
-//! [Java native methods]
diff --git a/src/androidextras/doc/src/external-resources.qdoc b/src/androidextras/doc/src/external-resources.qdoc
deleted file mode 100644
index b27f97b..0000000
--- a/src/androidextras/doc/src/external-resources.qdoc
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtAndroidExtras module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \externalpage https://developer.android.com/reference/android/app/Service#onStartCommand(android.content.Intent,%20int,%20int)
-    \title Android: Service onStartCommand
-*/
-
-/*!
-    \externalpage https://developer.android.com/reference/android/content/Context#startService(android.content.Intent)
-    \title Android: Service startService
-*/
-
-/*!
-    \externalpage https://developer.android.com/reference/android/content/BroadcastReceiver
-    \title Android: BroadcastReceiver
-*/
diff --git a/src/androidextras/doc/src/qtandroidextras-examples.qdoc b/src/androidextras/doc/src/qtandroidextras-examples.qdoc
deleted file mode 100644
index 3daf5c9..0000000
--- a/src/androidextras/doc/src/qtandroidextras-examples.qdoc
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/*!
-    \group examples-qtandroidextras
-    \title Qt Android Extras Examples
-    \brief Examples in the Qt Android Extras module.
-    \ingroup all-examples
-
-    These are the examples available in the \l{Qt Android Extras} module.
-
-    \note These examples will only work on Android.
-*/
diff --git a/src/androidextras/doc/src/qtandroidextras-index.qdoc b/src/androidextras/doc/src/qtandroidextras-index.qdoc
deleted file mode 100644
index 708df6d..0000000
--- a/src/androidextras/doc/src/qtandroidextras-index.qdoc
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \page qtandroidextras-index.html
-    \title Qt Android Extras
-
-    \brief The Qt Android Extras module contains adittional functionality to aid development on Android.
-
-    \section1 Getting Started
-
-    To include the definitions of the module's classes, use the
-    following directive:
-
-    \code
-    #include <QtAndroidExtras>
-    \endcode
-
-    To link against the Qt Android Extras module, add this line to your project file:
-
-    \code
-    QT += androidextras
-    \endcode
-
-    \section1 API Reference
-
-    Links to the API reference materials:
-    \list
-    \li \l{Qt Android Extras C++ Classes}{C++ Classes and Namespaces}
-    \endlist
-
-    \section1 Examples
-
-    \list
-    \li \l{Qt Android Extras Examples}
-    \endlist
-*/
diff --git a/src/androidextras/doc/src/qtandroidextras-module.qdoc b/src/androidextras/doc/src/qtandroidextras-module.qdoc
deleted file mode 100644
index 335d39d..0000000
--- a/src/androidextras/doc/src/qtandroidextras-module.qdoc
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \module QtAndroidExtras
-    \title Qt Android Extras C++ Classes
-    \brief The Qt Android Extras module contains additional functionality for development on Android.
-
-    \ingroup modules
-    \qtcmakepackage AndroidExtras
-    \qtvariable androidextras
-
-    To include the definitions of the module's classes, use the
-    following directive:
-
-    \code
-    #include <QtAndroidExtras>
-    \endcode
-
-    To link against the Qt Android Extras module, add this line to your project file:
-
-    \code
-    QT += androidextras
-    \endcode
-*/