aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated license headersAntti Kokko2016-01-2013-140/+1378
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-142-0/+688
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-212-0/+688
| |\
| | * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5Liang Qi2015-08-190-0/+0
| | |\
| | | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
* | | | Add fromLocalRef() to QAndroidJniObjectChristian Strømme2015-09-183-0/+34
* | | | Bump versionOswald Buddenhagen2015-09-101-1/+1
|/ / /
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-091-1/+1
|\| |
| * | Doc: fix missing comma in sample codeSamuel Gaist2015-08-031-1/+1
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-292-15/+49
|\| |
| * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| * | Add Changes file for the 5.5.0 releasev5.5.0-rc1v5.5.0Christian Strømme2015-06-081-0/+26
| * | Mark deprecated functions with QT_DEPRECATED.v5.5.0-beta1Christian Strømme2015-03-191-15/+23
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-171-30/+0
|\| |
| * | Doc: Remove unused documentation for comparison overloadsv5.5.0-alpha1Sergio Ahumada2015-03-061-30/+0
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-03-031-21/+7
|\| |
| * | Fix comparison overloads.Christian Strømme2015-03-021-21/+7
* | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ /
* | Fixed BSD licensed file headersJani Heikkinen2015-02-172-6/+6
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-130-0/+0
|\|
| * Bump versionv5.4.2Oswald Buddenhagen2015-01-161-1/+1
* | Update copyright headersJani Heikkinen2015-02-1229-174/+174
* | Complete test of all QAndroidJniObjects JNI types.Christian Strømme2015-01-223-0/+517
* | Android: Add more convenience types to QAndroidJniObject.Christian Strømme2015-01-111-39/+267
* | Add missing methodChristian Strømme2015-01-111-0/+6
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-171-0/+26
|\|
| * 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
| |/
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-212-36/+92
|\|
| * 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
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-201-0/+0
|\|
| * Update Qt icon used in the exampleTopi Reinio2014-10-151-0/+0
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-090-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
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-2822-1020/+667
|\| |
| * | Update license headers and add new licensesv5.4.0-alpha1Jani Heikkinen2014-08-2422-1020/+667
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ /
* | 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
|\|