aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
* Bump versionv5.4.2Oswald Buddenhagen2015-01-161-1/+1
* Merge remote-tracking branch 'origin/5.4.0' into 5.4v5.4.1Frederik Gladhorn2014-12-171-0/+26
|\
| * Add Qt 5.4.0 changelog for QtAndroidExtrasv5.4.0Alex Blasche2014-12-041-0/+26
* | Bump versionOswald Buddenhagen2014-12-121-1/+1
|/
* Fix use of va_list in QAndroidJniObjectv5.4.0-rc1Christian Strømme2014-11-061-32/+34
* Doc: document Qt Notification exampleLeena Miettinen2014-11-041-0/+54
* Fix QAndroidJniObject documentation errors/inconsistenciesAlex Blasche2014-10-281-4/+4
* Update Qt icon used in the exampleTopi Reinio2014-10-151-0/+0
* Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-beta1Frederik Gladhorn2014-09-160-0/+0
|\
| * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
* | Update license headers and add new licensesv5.4.0-alpha1Jani Heikkinen2014-08-2422-1020/+667
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\|
| * Bump versionv5.3.2Oswald Buddenhagen2014-06-181-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-091-1/+5
|\|
| * 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
| |/
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-246-6/+59
|\|
| * 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
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-242-2/+1
|\|
| * Add QAndroidActivityResultReceiver to the documentation.Christian Strømme2014-02-202-2/+1
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+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