summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
* Bump versionAlexandru Croitor2020-02-021-1/+1
* Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
|\
| * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-091-0/+20
* | JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4Assam Boudjelthia2020-01-201-1/+1
|/
* Bump versionDaniel Smith2019-12-161-1/+1
* Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
|\
| * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-251-0/+18
|/
* Doc: Fix documentation warningsTopi Reinio2019-11-112-5/+5
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
|\
| * Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-141-0/+20
| * Bump versionFrederik Gladhorn2019-10-141-1/+1
* | Update AndroidManifest.xml to be compatible with Qt 5.14Eskil Abrahamsen Blomfeldt2019-10-251-10/+5
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta2v5.14.0-beta1v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+40
|\ \
| * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| |\ \ |/ / / | | _
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | |\ | |/ /
| | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | |\ | | |/ /
| | | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-281-0/+20
| | |/
| * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | |\ \ | |/ / /
| | * | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-07-301-0/+20
* | | | Merge "Merge dev into 5.14 (delayed final downmerge)"Kari Oikarinen2019-09-040-0/+0
|\ \ \ \
| * \ \ \ Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-040-0/+0
| |\ \ \ \ |/ / / / /
| * | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-201-1/+1
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-201-1/+1
| | |\ \ \ \ | |/ / / / / | | | _ / / | | | / /
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-08-281-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-281-1/+1
| |\ \ \ \ |/ / / / / | | _ / / | | / /
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-171-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-171-1/+1
| | |\ \ | |/ / / | | | _
| | * Fix wrong JNI call function when calling QAndroidIntent::putExtra()Christian Strømme2019-08-151-1/+1
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-161-0/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
| |\ \ \ |/ / / / | | _ / | | /
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\ \ | | | |/
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ /
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
| |\ \ \ |/ / / / | | _ / | | /
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-292-3/+24
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-292-3/+24
| |\ \ \ |/ / / / | | _ / | | /
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-282-3/+24
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-282-3/+24
| | |\ \ | |/ / / | | | _
| | * Fix QAndroidJniEnvironment testChristian Strømme2019-06-281-3/+4
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | |\ | | |/ /
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | |/