aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| | | | | | | | + 6e48b90385570b573a8f5c9ccfc9e12e5cd81d49 JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4 + 2f0a5a4192fd8ca6d00391c6307973805d23a2f2 Bump version Change-Id: Icbcc65541c9b987da58f5b0520f2ebc8e6b087ab Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | Change-Id: I0c621ccd5188ec1fb86ba8f944615c22dee3bb6c
* Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
|\ | | | | | | Change-Id: Iad3f986510d1ff3820cf58e3286d828759ea7db2
| * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| | | | | | | | | | | | | | + 2cfef9d049640199559b20d05744db9f7abfde63 Bump version Change-Id: I842713a2ca080bf889f878a436caeff121eae8dc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4Assam Boudjelthia2020-01-201-1/+1
|/ | | | | | | | Update instance of old code using JNI_VERSION_1_4 to make the code consistent. Change-Id: I273f7224daa6a5f0bf7541e6ed61029cbdc790d5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Bump versionDaniel Smith2019-12-161-1/+1
| | | | Change-Id: Ia48f9ef54b1f54bebdf935d47a1e7f3165d1b943
* Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
|\ | | | | | | Change-Id: I632655abc2ef31f8acc307d0d6a277df9913be32
| * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-251-0/+18
|/ | | | | Change-Id: I7f96395accb050e365ef8f2f27df52870d2e5b51 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Doc: Fix documentation warningsTopi Reinio2019-11-112-5/+5
| | | | | | | | | | | | | Remove references of resultReceiver parameter from a new QtAndroid::startActivity() overload, as it has no such parameter. Add a few dummy typedefs specific to documentation builds, to avoid the Clang-parser from tripping over undefined types on non-Android platforms. Fixes: QTBUG-79813 Change-Id: I6972ae7d5b8d4ca7f338af8958ccf3cf43dce71c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id229f5875db1f1ae7dc4e3f34da3684b993ddff2
| * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | + 9039930c44d94fd101c260ef3abde680fc369501 Fix wrong JNI call function when calling QAndroidIntent::putExtra() + 72e0dcd050ae9a38b9db80956dd1f0db15e93e59 Add changes file for Qt 5.12.5 Change-Id: I62b8fd251ccba586accca56cc13265095dc77291 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | Change-Id: I14bdf31c85d9ce8fbee559482d465a0f13a021ba
* | Update AndroidManifest.xml to be compatible with Qt 5.14Eskil Abrahamsen Blomfeldt2019-10-251-10/+5
| | | | | | | | | | | | | | | | | | There are changes in Qt 5.14 which require updating the manifests of all applications unfortunately, otherwise they will not work. This fixes the manifest for the Notification example. Change-Id: Ia91972f87df412fcb89a2f002dee9a0b94adb004 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | 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
|/| | | |/ | | | | Change-Id: If77deaa1778b6d35a5a22ae046ed1e831a774be7
| * 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
| |/| | | | | | | | | | Change-Id: Ida6789657a640d5ddc1326d902c2acaf805dba42
| | * 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
| | |/| | | | | | | | | | | | | Change-Id: I44700a2a33493aada8e4fb488f771e4d1c2acc1c
| | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-281-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | + e0b68dfe82b350f5502e939d9cd2ff8a680f846a Fix QAndroidJniEnvironment test + a50f613a37acf32886ab94c0be780c1f25493d52 Bump version + 9039930c44d94fd101c260ef3abde680fc369501 Fix wrong JNI call function when calling QAndroidIntent::putExtra() Change-Id: I62ec92950642b4e4b62cc99fba5cfe02055045d1 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | 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
| |/| | | | | | | | | | | | | | Change-Id: Ie1a8ba9dd51e2de03c0ad6831cb90c71e1d41d3e
| | * | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-07-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 4a32bc040d79ff8df05f51b7e28e2b6f06a5d716 Bump version + dcae0e1072ebc04af7578953c0ff70bbf535cf64 Add changes file for Qt 5.12.4 + e0b68dfe82b350f5502e939d9cd2ff8a680f846a Fix QAndroidJniEnvironment test + 89edc161514a75b353b9efedb0a3628b62978e6e Bump version + a50f613a37acf32886ab94c0be780c1f25493d52 Bump version + ad06c63ffb6016670140d4d0ebdb347f5a222d3a Doc: Replace example file lists with links to code.qt.io Change-Id: Iae348f78f91c03ac7f862b261915163de71c2aba Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | 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
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: I7a5dceae5cc7bb49978c1323454011d1bfbb4161
| * | | | 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
| |/| | | | | | |/ / / | | | | | | | | | | Change-Id: Idb18a53aa0da5c5e964ab2e4eb05fae2da9a9565
* | | | | 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
|/| | | | | |/ / / | | | | | | | | Change-Id: I777ea96b000d48fd2aeb20003a825edf2e2949a1
| * | | 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
| |/| | | | |/ | | | | | | Change-Id: I6796a88dae9e17bafc7696abecb4bba271665241
| | * Fix wrong JNI call function when calling QAndroidIntent::putExtra()Christian Strømme2019-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Java function putExtra() returns an object, so it should be called with callObjectMethod() instead of callMethod(). Fixes: QTBUG-77101 Change-Id: Id6bb402c05b119257fb331db1eb4e016a94c0d52 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | 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
|/| | | | |/ / | | | | | | Change-Id: I7cf9d8f704d9d2e3ff96dfb517d4e4fd08a701ca
| * | 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
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3ce52129ba65049a46afcc4fb2b9c8800dbff441
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ifd7042806466af25857251274117de49e670118e
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Ie2b5f498fa6f4effc27f07f3aab0061fa77e94c9 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | 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
|/| | | | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5f06a85aa81655bfb21d67fc1fcef03b3f00d61b
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I30c027ac38d42ce12f91464c69d5f0dbcb93f802
* | | 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
|/| | | | |/ / | | | | | | Change-Id: If64a48a9d2c9dc9cf847d9839ca904e6073db100
| * | 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
| |/| | | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I513a9d5e99c2cfb2b5225850fa89394365a8d26b
| | * Fix QAndroidJniEnvironment testChristian Strømme2019-06-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QAndroidJniEnvironment class does not detach when it goes out of scope. Detaching will only happen if explicitly done, or if the thread we attached on dies. Fixes: QTBUG-73570 Change-Id: Iac749c7f3bf8fcee99f70c06123eb3c88315e261 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * 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
| | |/| | | | | | | | | | | | | Change-Id: I799f60bf599c0953dbd709285c24dfbc4a97eb62
| | | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Ida8188045af63feb51d4f967f5e00e15c2618622 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | |/ | | | | | | | | | Change-Id: I1cfa2db2abf207278cc78db797f8a6ff5dbd73e6
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 01:13:01 +0000