aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove QtAndroidExtras module and add note about its state in Qt 6HEADdevAssam Boudjelthia2021-06-2949-6352/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Remove left-over .pri filesJoerg Bornemann2021-05-052-29/+0
| | | | | | Task-number: QTBUG-88742 Change-Id: I702459fb5be26ba2183745eecc246b607c9409bf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove qmake project filesJoerg Bornemann2021-04-294-59/+0
| | | | | | | Task-number: QTBUG-88742 Change-Id: I45d52013f5f34919ee85c7ec6195073ad587a912 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Fix warning about QAndroidJNIObjectAndreas Buhr2021-02-191-1/+1
| | | | | | | | | | The warning qandroidserviceconnection.h includes QAndroidJniObject when it should include QtAndroidExtras/QAndroidJniObject is emitted on each build. This patch follows the warning's advice. Change-Id: Ic73bd5e855600c28aa8e882da530a8801cdce681 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Update CMake scripts in QtAndroidextrasAndreas Buhr2020-12-182-3/+22
| | | | | | | | | | Recreated all CMake files in QtAndroidextras using run_pro2cmake.py . --only-existing -- --api-version 3 and update qtbase dependency. Change-Id: I8dc07ae08b49cee41f18297cf13c4c57c36cae12 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Android: rename Android's package name for Qt 6Assam Boudjelthia2020-10-0512-22/+23
| | | | | | | | | | | Rename Android package name org.qtproject.qt5.android to org.qtproject.qt.android to avoid inconsistency with Qt 6 name. Also, we include the major version number in the jar target. Task-number: QTBUG-86969 Change-Id: I69cff0ca92dd2f365ea5a5e977fbbbe9833800be Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Doc: Fix documentation warningsTopi Reinio2020-09-022-2/+2
| | | | | | Pick-to: 5.15 Change-Id: I82a34fe82c2257685cdc9a6a278f2d7b476f336c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add Q_OBJECT to QAndroidServiceLars Schmertmann2020-07-031-0/+2
| | | | | | | | This is required to allow qobject_cast<QAndroidService>(qApp). Task-number: QTBUG-84382 Change-Id: Ia8654acc8388b5371ca9d4291a7404ad828638b0 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Doc: Update docs with cmake package informationNico Vertriest2020-06-261-0/+1
| | | | | | Task-number: QTBUG-85179 Change-Id: I606f144a63dbb216663bbe402a1ab8e1b68f5d0f Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-231-4/+4
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I54ea2f8ce980aabed8393a832d52811234a3ab58 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Make PermissionResult compatible with the Android valuesAssam Boudjelthia2020-06-121-2/+2
| | | | | | Task-number: QTBUG-73409 Change-Id: I994fb873c140a13151bde4ef065fd21f22701b93 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Add example to demonstrate working with custom Java objects/ArrayListAssam Boudjelthia2020-05-252-1/+1
| | | | | | | | | | | An example that retrieves music data from Java APIs, and store that in a Java ArrayList of objects. Then, how to pass that data to Qt via C++ and QML. Pick-to: 5.15 Task-number: QTBUG-83038 Change-Id: I5201572b997973388c688ca0d3f2f30240da12f6 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Add example to show how to work with activities and handle their resultAssam Boudjelthia2020-05-221-0/+0
| | | | | | | | Pick-to: 5.15 Task-number: QTBUG-83038 Change-Id: I87a631551c3c6fbb22eaaf56acad6b8ae87f4560 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-146-5/+18
|\ | | | | | | Change-Id: Iaf6d347954107fb26b179b7d3cb2662b3df504db
| * Add \brief tags to classesAssam Boudjelthia2020-04-256-5/+18
| | | | | | | | | | | | Task-number: QTBUG-80390 Change-Id: Ie37723184980c37bde6f868c3a85294b926673dd Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Docs: Add a snippet for findClass usageAssam Boudjelthia2020-05-111-0/+15
| | | | | | | | | | | | | | Task-number: Pick-to: 5.15 Task-number: QTBUG-83038 Change-Id: Ic789dfc55d73fba39ed2acf8f1b4376f772b7626 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Add Android services examplesAssam Boudjelthia2020-04-273-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | * Pure Android service in the same process. * Android Services with BroadcastReceiver with same .so file and separate .so file. * Android Service with QAndroidBinder in separate .so file. Pick-to: 5.15 Task-number: QTBUG-83038 Change-Id: I24a4dbe4f1de56736625cfdfe2e7fc3ea4905de5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | CMake: Initial CMake build system supportLeander Beernaert2020-04-243-0/+67
|/ | | | | | | Task-number: QTBUG-78171 Change-Id: I2f8b19a4c0af57461ad7b11cc58935c4991cb46e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Introduce new example JNI MessengerAssam Boudjelthia2020-03-121-0/+0
| | | | | | | | | | | This examples shows the proper way to communication between QML/C++ and Java in both ways. This example calls a Java method from QML and C++, then the Java method will also call back a C++ function that will be forwarded to a QML connection. Task-number: QTBUG-80717 Change-Id: I96d9551d1abcaf80899c4dd3c727a267fb6f3c07 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Fix notification example crashingAssam Boudjelthia2020-03-121-0/+0
| | | | | | | | | | | | | | The notification example needed some fixing because it was crashing, now passing context from C++ side. There are some changes to the Android Notification API, so some changes has to be made to make sure the example works for different old and new Android API levels. + Updating the icons. Task-number: QTBUG-80717 Change-Id: I1560e31b73233895053b1a9a6a523a7b163c5d89 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4Assam Boudjelthia2020-01-201-1/+1
| | | | | | | | Update instance of old code using JNI_VERSION_1_4 to make the code consistent. Change-Id: I273f7224daa6a5f0bf7541e6ed61029cbdc790d5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Doc: Fix documentation warningsTopi Reinio2019-11-112-5/+5
| | | | | | | | | | | | | Remove references of resultReceiver parameter from a new QtAndroid::startActivity() overload, as it has no such parameter. Add a few dummy typedefs specific to documentation builds, to avoid the Clang-parser from tripping over undefined types on non-Android platforms. Fixes: QTBUG-79813 Change-Id: I6972ae7d5b8d4ca7f338af8958ccf3cf43dce71c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-171-1/+1
|\ | | | | | | Change-Id: I6796a88dae9e17bafc7696abecb4bba271665241
| * Fix wrong JNI call function when calling QAndroidIntent::putExtra()Christian Strømme2019-08-151-1/+1
| | | | | | | | | | | | | | | | | | The Java function putExtra() returns an object, so it should be called with callObjectMethod() instead of callMethod(). Fixes: QTBUG-77101 Change-Id: Id6bb402c05b119257fb331db1eb4e016a94c0d52 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Ie2b5f498fa6f4effc27f07f3aab0061fa77e94c9 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Overload QtAndroid::startActivity with a callbackNicolas Fella2019-01-295-1/+162
| | | | | | | | | | | | | | | | | | The current way of handling activity results by inheriting from QAndroidActivityResultReceiver is very un-Qt. This patch allows handling activity results by passing a std::function/lambda expression to the startActivity function. Change-Id: Ie9dc91cd02dfcdb16a9ad0cb7858387e75159815 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Add a QtAndroid::startActivity that takes a QAndroidIntentAlbert Astals Cid2019-01-222-0/+24
|/ | | | | | | | | | | The function simply calls the other startActivity with QAndroidIntent::handle, anyone could do that from the user code, but i think it makes sense the library to allow you doing this directly given you're supposed to pass an intent and we have a class that represents an intent Change-Id: I673cb410b07ed4fd1408a971696a3b5ae3dfd063 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Fix class vs struct mismatchAlex Blasche2019-01-081-1/+1
| | | | | | | | | | | | | | | | | In file included from qtbase/include/QtCore/5.12.0/QtCore/private/qjni_p.h:1: qtbase/include/QtCore/5.12.0/QtCore/private/../../../../../src/corelib/kernel/qjni_p.h:68:1: warning: 'QJNIEnvironmentPrivate' defined as a class here but previously declared as a struct [-Wmismatched-tags] class Q_CORE_EXPORT QJNIEnvironmentPrivate ^ jni/qandroidjnienvironment.h:50:1: note: did you mean class here? struct QJNIEnvironmentPrivate; ^~~~~~ class Change-Id: I0df1a4350c50ca920ad7f13978a62913a9702a15 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* QAndroidIntent::putExtra: Fix JNI return value syntaxAlbert Astals Cid2019-01-031-1/+1
| | | | | | Change-Id: I8e9d534e8752466c57d79cbb136c4dec01c8695e Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Doc: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-072-2/+2
| | | | | | | | | | The use of QT_INSTALL_HEADERS caused documentation build failures in certain configurations. Use an alternative method to pass the required include paths to QDoc. Task-number: QTBUG-67925 Change-Id: Ia8c25b0cfb950f43ec60a3768cd192588a5e5617 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta4v5.12.0-beta3Qt Forward Merge Bot2018-10-201-0/+2
|\ | | | | | | Change-Id: I88b7094f8b625c14f2524576e73cf7fc3f807a1d
| * Check if the array is valid before accessing itAndy Shaw2018-10-191-0/+2
| | | | | | | | | | | | | | Task-number: QTBUG-70284 Change-Id: Ic2a0613f3f57661e8c6b4665cefbd6dc73fd37f3 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Allow users to find all classesBogDan Vatra2018-08-292-0/+19
|/ | | | | | | | | | | | QAndroidJniEnvironment::findClass is a convenient method needed to find classes in all class loaders. [ChangeLog][QtAndroid] QAndroidJniEnvironment::findClass convenient method to find classes in all class loaders. Change-Id: I23c9e8a02aa7ca02cf707be5548ce1f8bb555dd7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Fix startIntentSender Java signatureVolker Krause2018-07-141-1/+1
| | | | | Change-Id: Id585a4f8fb21eb263a601857b47e3fcfcb2c7f4a Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Doc: Fix documentation issues when using Clang-enabled QDocv5.11.0-beta4Topi Reinio2018-04-119-19/+101
| | | | | | | | | | | | | | | | QDoc in Qt 5.11 uses Clang to parse the C++ source for documentation comments. Unlike the old parser, Clang requires a module header to be present as well as correct include paths to generate the docs correctly. However, these are available from the build system only when building for Android, not when generating the documentation on a system with no Android-related assets. To fix this, create a 'dummy' module header specific to doc builds, add required relative include paths in .qdocconf, and fix the documentation \fn commands to work with Clang. Change-Id: Ia3d4e50ff8756cd8c8aae9cd3c3d1492eb7db328 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-1/+2
|\ | | | | | | Change-Id: I614aee68dea8253732b72e4534750897583aab45
| * Delay QtAndroidPrivate::setOnBindListener call until the QAndroidService ↵v5.10.1BogDan Vatra2018-02-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | constructor exits If we call QtAndroidPrivate::setOnBindListener before QAndroidService constructor exits the virtual table is not set and m_service->onBind will call the wrong method. Task-number: QTBUG-66222 Change-Id: I3d057e33dd36a317c5605d7eb5d6892827ad7b13 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Allow the user to easily register a binder creatorBogDan Vatra2018-02-072-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | Until now the users were forced to subclass QAndroidService in order to provide the binder. Now is much easier, the user just pass a lambda in the QAndroidService constructor e.g. QAndroidService app(argc, argv, [](const QAndroidIntent &){ return new MyBinder{};}); Change-Id: I97608f806b311ad3c853a86cde132aea8352349b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-205-11/+31
|\| | | | | | | Change-Id: I1f8c55c8647779c972d7d152ecd0c56bdf66a586
| * Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-305-11/+31
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I67661e95e931fd7c6992f8f1769c50472c5e5f15
| | * Fix outdated BSD headerKai Koehne2017-09-292-2/+22
| | | | | | | | | | | | | | | Change-Id: Icfe3f6a712a8e457dd695b5f0f982760eb78f4f1 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * Fix outdated FDL headerKai Koehne2017-09-293-9/+9
| | | | | | | | | | | | | | | Change-Id: Ia4fbd4718a698e0d4a0835869e51852c12b1442d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Android: remove support for local/debug deploymentBogDan Vatra2017-09-065-23/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the pre-dexed JAR files activated by the absence of the bundled_jar_file CONFIG option, as versions of Android >= 5 no longer support this deployment mechanism. Now, the "bundled" JARs simply become normal JARs containing class files, and are neither activated by a bundled_jar_file CONFIG entry nor do they have a -bundled suffix in the file's base name. Task-number: QTBUG-62995 Change-Id: Id370f03de61463bb3a8312d357374cf5c89fca69 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Add public API for Android new Permission ModelBogDan Vatra2017-07-262-0/+88
| | | | | | | | | | | | Task-number: QTBUG-50759 Change-Id: Ie7fef30049e6be28c3fba2eb5b54b56552df8c9d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Say hello to low level Android Service & Binder implementationsBogDan Vatra2017-07-2628-3/+1878
| | | | | | | | | | | | | | | | | | | | These are the building blocks for higher level APIs such as Qt Remote Objects. [ChangeLog][Android] Added low level APIs for Android Service & Binder. Change-Id: I320214d310a398541bbde985ecf67bf6101c0b67 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | [doc] Add doc for QtAndroid::RunnableBogDan Vatra2017-07-041-0/+6
| | | | | | | | | | Change-Id: Ib9d88dee71459d61d12bb975e24e8e59e687434d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Android: Allow timeout to fade out splash screenMathias Hasselmann2017-03-202-3/+15
|/ | | | | | Change-Id: If78fe57fd5ceccad541fb2b3d7a92eefcda06057 Task-number: QTBUG-59200 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Add QtAndroid::androidContext()v5.8.0-alpha1Alex Blasche2016-08-042-4/+20
| | | | | | | | [ChangeLog][QtAndroidExtras][QtAndroid] Added QtAndroid::androidContext() Task-number: QTBUG-55102 Change-Id: I95122c8939e227acffb13ea9ba1a338a9d05595a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-225/+225
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idbbad4585c05ea7c42c5d60e8b74ec20ca3d8737
| * Workaround clang buggy explicit specializations function templates exportv5.6.2BogDan Vatra2016-07-191-225/+225
| | | | | | | | | | | | | | | | Should be reverted when https://github.com/android-ndk/ndk/issues/34 is fixed Change-Id: Idcc951ff432dbadd57a09851bcb7486b019b3426 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-18 04:56:06 +0000