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 /src/androidextras/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 'src/androidextras/CMakeLists.txt')
-rw-r--r-- | src/androidextras/CMakeLists.txt | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/androidextras/CMakeLists.txt b/src/androidextras/CMakeLists.txt deleted file mode 100644 index 45e7cde..0000000 --- a/src/androidextras/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -# Generated from androidextras.pro. - -##################################################################### -## AndroidExtras Module: -##################################################################### - -qt_internal_add_module(AndroidExtras - SOURCES - android/qandroidactivitycallbackresultreceiver.cpp - android/qandroidactivityresultreceiver.cpp android/qandroidactivityresultreceiver.h android/qandroidactivityresultreceiver_p.h - android/qandroidbinder.cpp android/qandroidbinder.h android/qandroidbinder_p.h - android/qandroidfunctions.cpp android/qandroidfunctions.h - android/qandroidintent.cpp android/qandroidintent.h - android/qandroidparcel.cpp android/qandroidparcel.h android/qandroidparcel_p.h - android/qandroidservice.cpp android/qandroidservice.h - android/qandroidserviceconnection.cpp android/qandroidserviceconnection.h - android/qjnionload.cpp - jni/qandroidjnienvironment.cpp jni/qandroidjnienvironment.h - jni/qandroidjniobject.cpp jni/qandroidjniobject.h - DEFINES - QT_NO_USING_NAMESPACE - LIBRARIES - Qt::CorePrivate - PUBLIC_LIBRARIES - Qt::Core - PRIVATE_MODULE_INTERFACE - Qt::CorePrivate -) - -if(ANDROID) - set_property(TARGET AndroidExtras APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES - jar/Qt${QtAndroidExtras_VERSION_MAJOR}AndroidExtras.jar # special case - ) -endif() -qt_internal_add_docs(AndroidExtras - doc/qtandroidextras.qdocconf -) - |