From ae24e41ad4da78b029fd42ea317e4d2be73b015e Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 11 May 2021 12:49:40 +0300 Subject: Remove QtAndroidExtras module and add note about its state in Qt 6 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 --- .../doc/src/qtandroidextras-module.qdoc | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 src/androidextras/doc/src/qtandroidextras-module.qdoc (limited to 'src/androidextras/doc/src/qtandroidextras-module.qdoc') 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 - \endcode - - To link against the Qt Android Extras module, add this line to your project file: - - \code - QT += androidextras - \endcode -*/ -- cgit v1.2.3