aboutsummaryrefslogtreecommitdiffstats
path: root/src/androidextras
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* Add non-templated versions of get[Static]ObjectField()Christian Strømme2014-02-132-0/+29
| | | | | | | | | | Ideally the getStaticObjectField() and getObjectField() methods, that take a signature, should never have been templated. Removing the templated versions now will cause ABI breakage, so the only solution is to add new non-templated versions. Change-Id: I2f6e9f259b7bc511ef5bcaeb8a2077b0f267b8c8 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Add API to get the Android API levelChristian Strømme2014-02-072-0/+12
| | | | | | | | | | | The Android SDK version, or API level, is commonly used to determine what APIs are available at runtime. [ChangeLog][QtAndroidExtras] Added convenience method for getting the Android SDK version. Change-Id: Ic20322f68bc9680aec9e1c8404583462063904db Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add new method to get the main Android activity.Christian Strømme2014-02-076-4/+142
| | | | | | | | | | | | There were no public APIs the user could use to get access to their applications main activity, and thus far the only solution have been to access undocumented and private APIs. [ChangeLog][QtAndroidExtras] Added functionality to get the Android main activity. Change-Id: Ifd4121e8bc643360ed7a7038ffae9e872b59db71 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix for some typos in the QAndroidJniObject documentation.old/5.2Christian Strømme2014-01-271-2/+2
| | | | | | | | qualified was misspelled "qulified". Change-Id: Ie38ec999f0c3b7146cc52c9a28c2a82d5d007355 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Updated the qdocconf to include .java filesVenu2013-12-131-0/+1
| | | | | | | | | | | | | | | | QDoc ignores the .java files without the following entry in the qdocconf: examples.fileextensions += *.java Java files are not part of the default set of file types included by Qdoc. So there must be an entry in the qdocconf to force Qdoc to include additional file types such as the .java files. Task-number: QTBUG-35568 Change-Id: Ic8b805e0dec937fb0e8b19f0b94883ced5eb6c04 Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix non-compiling doc snippets.Alex Blasche2013-12-132-9/+9
| | | | | Change-Id: I0e5160f18f89ed25882741d93410ea1860ed659a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Remove stray curly bracket in QAndroidJniObject's documentation.Christian Strømme2013-12-131-1/+1
| | | | | | | The bracket was misplaced in a very unfortunate place. Change-Id: Id2f0f96cc49689cb6c656757ddae6690ff1da0d2 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Add examplesinstallpath in qdocconfv5.2.0-rc1v5.2.0Christian Strømme2013-11-211-0/+3
| | | | | | | | If we don't add examplesinstallpath the examples won't be shown in Qt Creator's welcome page. Change-Id: Ia1c0015262e4dd3c6de83d7d73231e3e3e0cf027 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix note about jni references in documentation.Christian Strømme2013-11-071-2/+2
| | | | | | | | QAndroidJniObject does not manage user created references regardless of them being local or global refs. Change-Id: I4afa8aba8d53f35d83d36758946d4b0f0cb5734a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix bug in code snippet.Christian Strømme2013-11-071-2/+3
| | | | | | | | We should set a good example by deleting local refs. as soon as we are done with, also in our own examples... Change-Id: Ib9b25b226d79532c137e1c404625840ffd3cdf6e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: If3b2ef1bec1805e5f6bf14c8468126e4160e0ed0 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Update documentationChristian Strømme2013-10-297-53/+281
| | | | | | | | | | - The list of examples was not showing in the index page. - Added information about types, method signatures, J2N and GC. - Fixed some typos. Change-Id: Ibe66ddbc0b1cac323563d629ca82bfe54d69dfc1 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Rename QJNIXxx classes to QAndroidJniXxx.Christian Strømme2013-10-107-390/+390
| | | | | | | | | The old classes where not following the usual convention for acronyms in class names. Change-Id: I2fad72483c51ca95a2703d914d6a678c5f7cde98 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Adding "qtdoc" to the depends qdocconf variable.Jerome Pasion2013-10-081-1/+3
| | | | | | | | Needed in order to link to the main Qt 5.2 documentation. Change-Id: I451f4d60f165befe179cfe58904876c42211cfee Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix infinite recursion in QJNIObject::getStaticField<jfloat>()Eskil Abrahamsen Blomfeldt2013-09-231-2/+2
| | | | | Change-Id: I4e22a43bb689f46c5fb294da9d55671a28cab4cf Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Improve documentation.Christian Strømme2013-09-237-71/+191
| | | | | Change-Id: Ia3999f853aa9b0ca1678f322419ddd200cae4b1a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add example of JNI APIEskil Abrahamsen Blomfeldt2013-09-232-1/+1
| | | | | | | | This example adds a custom class to the project and calls into it with JNI to set a notification message in the status area. Change-Id: I74d7a87c0511b98608422788c1c282e9af57c074 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Add Qt JNI API.Christian Strømme2013-09-2012-0/+2706
The QJNI API's provide an easy way to communicate with Java API's from C++. The API consists of two classes, QJNIObject which acts as a wrapper around Java classes and QJNIEnvironment which attaches the current thread to the Java VM and exposes the Java Native Interface. Change-Id: I9cdc395249de74f940b75eab9f2bd32347d5d432 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>