aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.15.2v5.15.2Antti Kokko2020-10-281-0/+28
| | | | | | | | | | | - 1c4b63418fe3657fcb213a7f03bc2605ee0f2386 Add changes file for Qt 5.15.1 + 0bfbd231c26253a6cc7d42eef63f6f31327c14a9 Doc: Fix documentation warnings + 28eea59d45c7f381caaf3da18ae040b7e4bd55a7 Bump version + ce9aa0c91b86f386442379a5e653c32437de1ba0 Add changes file for Qt 5.12.10 Pick-to: dev 5.15 Change-Id: I7d22b0cbc6695b91aa62c993b6e6dd4035850b19 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I3db1230ec94f2f04646f05e76152ad90292addbf Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit b6a10faf9657b774acffee882a22a2f9c1fa3558) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I35190c4744eb0ee0d208dbb7421777bba48a5f56
* Doc: Fix documentation warningsTopi Reinio2020-09-022-2/+2
| | | | | | | Change-Id: I82a34fe82c2257685cdc9a6a278f2d7b476f336c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 0fec72fe5bb3b095e5c6eb1a98bc42289e56c999) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-271-0/+28
| | | | | | | | | | | | | | + b80262f9d844b01c713c7df32754fc8194de900f Docs: Add a snippet for findClass usage + 9dc12a9289d542fabed8a30ad347ed80e471f93b Add Android services examples + 79f643e6f9f91015e18605854161e96ed12730a3 Add Android Service examples with Remote Objects + 174da8f65245ae4f9333dc169d60fbdf3003f1ea Add example to show how to work with activities and handle their result + 73684040207ce0cbb782dda5dc27cb8ac71243b3 Add example to demonstrate working with custom Java objects/ArrayList + 32b7e00d6da531dabc231af17c70e3bc06f823e3 Bump version Change-Id: I15709d94be819bba1ad317ceff18850152f95153 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 3621223c1f81dea54e93af81b81c75426941365c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I0a72a4892c07e993baf190a5f5e42e1f7e9ed7db
* Add example to demonstrate working with custom Java objects/ArrayListAssam Boudjelthia2020-05-2512-3/+736
| | | | | | | | | | | | An example that retrieves music data from Java APIs, and store that in a Java ArrayList of objects. Then, how to pass that data to Qt via C++ and QML. Task-number: QTBUG-83038 Change-Id: I5201572b997973388c688ca0d3f2f30240da12f6 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit 8ebbdcc7c4a0c2c6f863060500136b9399eccf98) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add example to show how to work with activities and handle their resultAssam Boudjelthia2020-05-2513-2/+691
| | | | | | | | | Task-number: QTBUG-83038 Change-Id: I87a631551c3c6fbb22eaaf56acad6b8ae87f4560 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com> (cherry picked from commit 85b2ea13da75303371ef8f82d5c0a079fa437904) Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Add Android Service examples with Remote ObjectsAssam Boudjelthia2020-05-2518-2/+1127
| | | | | | | | | Additional service examples with communication using Qt Remote Objects. Task-number: QTBUG-83038 Change-Id: I6451c816681e314bd4f47c8966c5d98cd225e64d Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit d560ad9f356e2f5912b0ebabde4c001efcb9b31f)
* Add Android services examplesAssam Boudjelthia2020-05-2545-3/+2988
| | | | | | | | | | | | | * Pure Android service in the same process. * Android Services with BroadcastReceiver with same .so file and separate .so file. * Android Service with QAndroidBinder in separate .so file. Task-number: QTBUG-83038 Change-Id: I24a4dbe4f1de56736625cfdfe2e7fc3ea4905de5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit c61bce34948922e006dc6c507e71dc4c82588a6c)
* Docs: Add a snippet for findClass usageAssam Boudjelthia2020-05-181-0/+15
| | | | | | | | Task-number: QTBUG-83038 Change-Id: Ic789dfc55d73fba39ed2acf8f1b4376f772b7626 Reviewed-by: BogDan Vatra <bogdan@kdab.com> (cherry picked from commit 9d11c9fe80e1c6801e1b378efeebf9127887a60a) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-147-5/+38
|\ | | | | | | Change-Id: I8a86bc5e72ac6713ebf7938df8e19be527c04538
| * Add changes file for Qt 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Antti Kokko2020-04-271-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | + 9ee2af5485f02cbd4cd88cc02ab147f830007a71 Bump version + a55cae70165206bd2a04306291fb3442968b69c3 Fix notification example crashing + fe69fb5371b193288fcb1b38d70c9fd4ac4fd74a Introduce new example JNI Messenger + 934bb1fba36ba9272a99be87bde72daf31de37d5 Fix icon name typo in NotificationClient.java + 645acc14632f39b3adcc4312d7d1cf8ff915c8c3 Fix wrong section in jnimessenger docs + b200d03464589d5869e80a0aadff22cc39ea8ac2 Add \brief tags to classes Change-Id: I9c0c68e8014ee81c498965bf1a2b6b380f5aaba0 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| * Add \brief tags to classesAssam Boudjelthia2020-04-256-5/+18
| | | | | | | | | | | | Task-number: QTBUG-80390 Change-Id: Ie37723184980c37bde6f868c3a85294b926673dd Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: Id052db5e4158ed13e7d26336dd1337bf0da1c684
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | |/ |/| | | Change-Id: I625a0c138c3931501842febae4697010c81b0f52
| * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ | | | | | | | | | Change-Id: I4abcd1e6b9a83cea281d5cb09f423b0d846f36da
| | * 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>
* | Fix wrong section in jnimessenger docsv5.15.0-beta4Assam Boudjelthia2020-04-031-1/+1
| | | | | | | | | | Change-Id: I68148eb0b0556cba3e004618a15444dcb6663a1e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Fix icon name typo in NotificationClient.javav5.15.0-beta3Assam Boudjelthia2020-03-131-2/+2
| | | | | | | | | | Change-Id: I68d221ba772c88586a9a29057d6819f097b92c87 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | Introduce new example JNI MessengerAssam Boudjelthia2020-03-1217-2/+668
| | | | | | | | | | | | | | | | | | | | | | This examples shows the proper way to communication between QML/C++ and Java in both ways. This example calls a Java method from QML and C++, then the Java method will also call back a C++ function that will be forwarded to a QML connection. Task-number: QTBUG-80717 Change-Id: I96d9551d1abcaf80899c4dd3c727a267fb6f3c07 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Fix notification example crashingAssam Boudjelthia2020-03-1214-71/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The notification example needed some fixing because it was crashing, now passing context from C++ side. There are some changes to the Android Notification API, so some changes has to be made to make sure the example works for different old and new Android API levels. + Updating the icons. Task-number: QTBUG-80717 Change-Id: I1560e31b73233895053b1a9a6a523a7b163c5d89 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic9f4c64bb43eab84678168697f1363f95acb1c59
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I0c621ccd5188ec1fb86ba8f944615c22dee3bb6c
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: I07fd82ca06ece5c47a72139c33ef3274a6ee58d3
| * 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>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-211-1/+1
|\| | | | | | | | | | | Change-Id: Icfab788cc2671f4fd678c77e1ece51c284d358fb
| * | 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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id9ee7c383f2762f18dad47dc041628ddcf03a44c
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: Ia48f9ef54b1f54bebdf935d47a1e7f3165d1b943
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
|\| | | | | | | Change-Id: I23eebe25ff6ac11539d4dc91c6035651b8038954
| * 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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-162-5/+5
|\| | | | | | | Change-Id: Ibbbcb3186feb5e67011ac7915ad4633c9689b68f
| * 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.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\| | | | | | | Change-Id: I9da9d39dffb49eca2c54e3768e5210dfb0e00afe
| * 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
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-261-10/+5
|\| | | | | | | | | | | Change-Id: If6f4ba688013fa585513bdb8218b671a739b3386
| * | 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.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
|/| | | | |/ / | | | | | | Change-Id: I23fdd23c79a3b85e09c6e75beec343b1c2733ff2
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 05:16:51 +0000