aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+1
|\| | | | | | | Change-Id: I324ee61f7627de76bcc3765fe18fa009166fe5b5
| * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I7a98d68cbc0623e86bb9dcfb3cadd1adc9631ebf Task-number: QTBUG-52953 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-084-7/+9
|\| | | | | | | Change-Id: I3d3f2f84808ca29a056783873dd78094a53c2875
| * Purge sRGB chunks from PNG in documentation.Edward Welbourne2016-03-291-0/+0
| | | | | | | | | | | | | | | | Subjects a *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: Ief67f8ca4dfc44655af62e70c10cb623acf83642 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Make more ctors explicitMarc Mutz2016-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. This change only affects C++11. Change-Id: I01ef7f6c26c8087e8516c9d66067060a6ed7c020 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * De-inline ~QAndroidJniObject() dtorMarc Mutz2016-03-222-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By making the destructor (usually the first non-inline, non-pure, virtual function, and therefore the trigger for most compilers to emit the vtable and type_info structures for the class in that TU) out-of-line, vtables and, more importantly, type_info strucures for the class are pinned to a single TU. This prevents false negative dynamic_cast and catch evaluation. Since it is already exported, users of the class are unaffected by the change, but since it's public API, and the dtors may have been de-virtualized and inlined into application code, we need to avoid adding code to the out-of-line dtor until Qt 6. Task-number: QTBUG-45582 Change-Id: I60273f7352be0d5a45a94828647d61f0ec9f1d79 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I26201944b21d83f78c9e1c75cbd55334cd16359f Task-number: QTBUG-45291 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-071-1/+2
|\| | | | | | | Change-Id: If08e856e0de436395382ef141b55f8d1e984535f
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-1/+2
| | | | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. no actual effect in this module. Change-Id: Ie4e6968b9a10fd20895393d4f7f5b490c7e8119d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Add hideSplashScreen function.v5.7.0-alpha1BogDan Vatra2016-02-252-0/+14
| | | | | | | | | | | | | | This function is useful to hide a sticky splash screen. Change-Id: I724a47a8cb73d3288916ed77b760217520d6b5ef Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Add new method to get the main Android service.Michael Dippold2016-02-192-1/+15
| | | | | | | | | | | | | | | | Currently accessing the service requires use of private APIs. Change-Id: I480657978e8318f98f5ee24bd4587c467110677a Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-151-3/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4497150a68daf85260a55a6539f5ed178b55a725
| * Doc: Update examplesinstallpath to include the repository namev5.6.0-beta1Topi Reinio2015-10-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I4bc22773d7528fa6ffbb128b70c6708eceffcced Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Helper functions needed to run Runnables on Android UI thread easily.BogDan Vatra2016-02-052-0/+52
| | | | | | | | | | | | | | | | | | Add two function to allow the users to easily run (a)synchronously Runnables from any thread directly to Andoroid UI thread. These functions are useful to create java controls and to access their methods, which must done on Android UI thread. Change-Id: Iec5437321e6136cc90268cc7ecf091f82fc4cdd3 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-2010-140/+200
| | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I8bec15fbd91b483adb0f9e24878a701e9fb0061d Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Add fromLocalRef() to QAndroidJniObjectChristian Strømme2015-09-182-0/+25
|/ | | | | | | | | This makes it more convenient to transfer the ownership of the local JNI reference to QAndroidJniObject. Before this change user would need to manually delete the local ref. after creating a QAndroidJniObject. Change-Id: Iebae7829773d1b783dc0982de92c51b4c6b0abd1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Doc: fix missing comma in sample codeSamuel Gaist2015-08-031-1/+1
| | | | | | Task-number: QTBUG-44114 Change-Id: I0a43a2da13fdcd3d18caf87628a7f13f4685ecc6 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Mark deprecated functions with QT_DEPRECATED.v5.5.0-beta1Christian Strømme2015-03-191-15/+23
| | | | | | | This makes it clear that the functions are going away. Change-Id: Ia93d3be4b70541bdf3bf800ebb85ad88d44b475d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Doc: Remove unused documentation for comparison overloadsv5.5.0-alpha1Sergio Ahumada2015-03-061-30/+0
| | | | | | | | this change amends 4eb51def Change-Id: I4bcbee03ba4ba44ad05db0b7bd38c208ff9d4e5a Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix comparison overloads.Christian Strømme2015-03-021-21/+7
| | | | | | | | | | | | | | | | | | The templated comparison overloads could cause build errors due to overload resolution being ambiguous; since implicit conversion from jni object types to QAndroidJniObject is allowed the operator could end up competing with built in types. To avoid that we get this ambiguity both arguments of the operators will now require a QAndroidJniObject, this effectively disables the templated operators unless called directly. Since the templated operator overloads does not export any symbols and are still callable, we retain both SC* and BC. *Code that is written after this change, that would otherwise be affected by this bug, will of course not be able to move back to an older version. Task-number: QTBUG-43453 Change-Id: Icc774c432d078aeb7eb80ccbd0c25196af5f5a51 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Fixed BSD licensed file headersJani Heikkinen2015-02-172-6/+6
| | | | | Change-Id: I8fc57754926b441c8d6cb81e25ea09a5eb3029a5 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Update copyright headersJani Heikkinen2015-02-1215-98/+98
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Id0bb1fd5a9d695520753a280bb1ad5ba1ccc6026 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Android: Add more convenience types to QAndroidJniObject.Christian Strømme2015-01-111-39/+267
| | | | | | | | | | | | This change adds more convenience methods for jclass, jobject, jthrowable etc. while some of them don't add much value, they should be included for completeness. [ChangeLog][QAndroidJniObject] Added convenience functions for jclass, jobject, jobjectArray and jthrowable Change-Id: I46099f21b7806a22a8a539a1e91535ed61e395bb Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Add missing methodChristian Strømme2015-01-111-0/+6
| | | | | | | | | | | The method callObjectMethod didn't have a jcharArray convenience method, as the equivalent static method has. [ChangeLog][QAndroidJniObject] Added the missing jcharArray variant of the callObjectMethod. Change-Id: Ic5168f4604d7abe11788c18cba765d3660a91ed3 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Fix use of va_list in QAndroidJniObjectv5.4.0-rc1Christian Strømme2014-11-061-32/+34
| | | | | | | | va_list functions where update to work on x86 where va_list is defined as char*. Change-Id: If1286a36d766b8536ca9a83ca21791d30b7b307c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Fix QAndroidJniObject documentation errors/inconsistenciesAlex Blasche2014-10-281-4/+4
| | | | | Change-Id: Ica7189c104d239183cf976956bfa63bd666424ab Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Update license headers and add new licensesv5.4.0-alpha1Jani Heikkinen2014-08-2410-185/+105
| | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Iad800f28f4e85e3f00512400ed9c5ed196c5097a Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I2064a47e17a56636586f6c69b1630781cf6f0aaa Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix documentation for QAndroidJniObjectChristian Strømme2014-03-182-2/+45
| | | | | | | | | | QDoc does not differentiate between the templated and non-templated versions of the same function. Change-Id: Ifa5cfcf0780c267e996a64fd76581032126f0247 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix typoSergio Ahumada2014-03-031-1/+1
| | | | | Change-Id: I4a5485c38897a3bc338ef015c08e6177e871ab26 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Fix includes in qandroidactivityresultreceiver.hv5.3.0-alpha1Christian Strømme2014-02-241-2/+2
| | | | | Change-Id: I14589f095226ec35af74d9355ecfb0a035ea0525 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add QAndroidActivityResultReceiver to the documentation.Christian Strømme2014-02-202-2/+1
| | | | | | | | QAndroidActivityResultReceiver was missing the \inmodule command and was therefore not shown in the class list. Change-Id: Ide0670e7ff377420e9690b6ff5421bf5fe0d96e3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add API for starting intentsEskil Abrahamsen Blomfeldt2014-02-166-2/+362
| | | | | | | | | | | | | | | | | We need an API for this, because otherwise it would be impossible to start intents and get results from them without having access to the application's activities. For third-party libraries etc., this is required. When we define a public Java API, we will implement a similar API there, so that applications can also start intents from Java code without worrying about collisions with third-party add-ons. [ChangeLog][Intents] Introduced API to launch intents. Change-Id: Ic3bbfbbaced3278c2ee970e74cba2997d5d867c4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Add non-template version of QAndroidJniObject::object()Christian Strømme2014-02-131-0/+1
| | | | | | | | In many cases we just want the jobject, this removes the need to add the template type. Change-Id: Iac5d8eab2b784908201baa8a05b126b4e7e5c86f Reviewed-by: BogDan Vatra <bogdan@kde.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 09:40:05 +0000