diff options
author | Assam Boudjelthia <[email protected]> | 2021-05-11 12:49:40 +0300 |
---|---|---|
committer | Assam Boudjelthia <[email protected]> | 2021-06-29 14:08:24 +0300 |
commit | ae24e41ad4da78b029fd42ea317e4d2be73b015e (patch) | |
tree | 3f2d8c44dbf5a3eb666a7782bb5c1dfd62481c8e /CMakeLists.txt | |
parent | ede82024b08842e9599b9bdbd00b7498601a921f (diff) |
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 <[email protected]>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 4e28914..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Generated from qtandroidextras.pro. - -cmake_minimum_required(VERSION 3.15.0) - -include(.cmake.conf) -project(QtAndroidExtras - VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt AndroidExtras Libraries" - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C -) - -# Make sure we use the fixed BASE argument of qt_add_resource. -set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) - -# special case begin -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui) - -if (NOT ANDROID) - message(NOTICE "Skipping the build as the condition \"ANDROID\" is not met.") - return() -endif() -# special case end - -if(NOT TARGET Qt::Gui) - message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.") - return() -endif() - -qt_build_repo() |