aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump version5.3Frederik Gladhorn2014-08-291-1/+1
* Bump versionv5.3.2Oswald Buddenhagen2014-06-181-1/+1
* Merge remote-tracking branch 'origin/release' into stablev5.3.1Frederik Gladhorn2014-05-011-1/+5
|\
| * Doc: Improved example documentation.v5.3.0-rc1v5.3.0Jerome Pasion2014-04-251-1/+5
* | Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-221-1/+1
|/
* Update the AndroidManifestv5.3.0-beta1Christian Strømme2014-03-201-1/+3
* Add test for isClassAvailable()Christian Strømme2014-03-201-0/+8
* Fix documentation for QAndroidJniObjectChristian Strømme2014-03-182-2/+45
* Fix typoSergio Ahumada2014-03-031-1/+1
* Fix includes in qandroidactivityresultreceiver.hv5.3.0-alpha1Christian Strømme2014-02-241-2/+2
* Add QAndroidActivityResultReceiver to the documentation.Christian Strømme2014-02-202-2/+1
* Add API for starting intentsEskil Abrahamsen Blomfeldt2014-02-166-2/+362
* Add non-template version of QAndroidJniObject::object()Christian Strømme2014-02-132-0/+3
* Add non-templated versions of get[Static]ObjectField()Christian Strømme2014-02-133-3/+48
* Add API to get the Android API levelChristian Strømme2014-02-073-0/+18
* Add new method to get the main Android activity.Christian Strømme2014-02-079-5/+209
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-271-2/+2
|\
| * Fix for some typos in the QAndroidJniObject documentation.old/5.2Christian Strømme2014-01-271-2/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-170-0/+0
|\|
| * Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-163-10/+11
|\|
| * Doc: Updated the qdocconf to include .java filesVenu2013-12-131-0/+1
| * Fix non-compiling doc snippets.Alex Blasche2013-12-132-9/+9
| * Remove stray curly bracket in QAndroidJniObject's documentation.Christian Strømme2013-12-131-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-298-24/+27
|\|
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-268-24/+27
| |\
| | * Add examplesinstallpath in qdocconfv5.2.0-rc1v5.2.0Christian Strømme2013-11-211-0/+3
| | * Fix license headers in exampleEskil Abrahamsen Blomfeldt2013-11-215-6/+5
| | * Update AndroidManifest.xml in exampleEskil Abrahamsen Blomfeldt2013-11-122-18/+19
| * | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| |/
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0810-102/+294
|\|
| * Fix note about jni references in documentation.Christian Strømme2013-11-071-2/+2
| * Fix bug in code snippet.Christian Strømme2013-11-071-2/+3
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| * Update documentationChristian Strømme2013-10-297-53/+281
| * Removed JNI_OnLoad() as it's no longer needed.v5.2.0-beta1Christian Strømme2013-10-163-48/+11
* | Merge branch 'stable' into devSergio Ahumada2013-10-1526-700/+644
|\|
| * Rename QJNIXxx classes to QAndroidJniXxx.Christian Strømme2013-10-1016-562/+562
| * Doc: Adding "qtdoc" to the depends qdocconf variable.Jerome Pasion2013-10-081-1/+3
| * Test the generated cmake files.Stephen Kelly2013-10-023-0/+22
| * Update the git-archive export optionsSergio Ahumada2013-09-271-0/+4
| * Doc: Enable running 'make docs' on non-android platformsTopi Reinio2013-09-261-2/+7
| * Remove JNI_OnLoad() from the example.v5.2.0-alpha1Christian Strømme2013-09-264-135/+3
| * Add missing files for exampleEskil Abrahamsen Blomfeldt2013-09-252-0/+41
| * Check for the qml module before building the notification example.Christian Strømme2013-09-251-2/+4
* | Merge branch 'stable' into devSergio Ahumada2013-09-2532-95/+1653
|\|
| * Fix infinite recursion in QJNIObject::getStaticField<jfloat>()Eskil Abrahamsen Blomfeldt2013-09-231-2/+2
| * Added QJNIObject auto test.Yoann Lopes2013-09-233-1/+736
| * Added QJNIEnvironment auto test.Yoann Lopes2013-09-233-2/+118
| * Improve documentation.Christian Strømme2013-09-237-71/+191