aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgpl5.15Tarja Sundqvist2024-01-041-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I89959c204392caa0d177e27679e3f986d3da9bf4
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: I7faa664932ee445a9564e67f79353fe4f32aff9c Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-111-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ie5b14b3bf261a4f54cfe0c0cd1800a577a7a66f1
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: I79bf0fd5d81efd430e1cf33b72ae450ba71b6a3f
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-091-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I6292278b8db2ef97c889817e781cdc2766500b38
| * Bump versionTarja Sundqvist2022-06-151-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-241-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ia25d869aad5f3d4f8446b1fb0ddd4169218455d5
| * Bump versionTarja Sundqvist2022-04-061-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-231-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I80438d2a1be04597a80892405ef6b22a640d9a3d
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Idaa947eca6bd64a9a5084e14788418bbb43aed42
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I0a4df8ed87b34b8862dcce0105fe27957a7b86f4
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: Iebabd3e2813d62bd2b8c6c41c9f2677153de46e2
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I72d219902a5364967b2dae6520ef60feb761164c
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-161-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iffea941c4502d9bcc49ea09ca77a83b8e929dabd
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I469ffac094ebc4e9ccfb8fc59502fedd91cd9969
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iee3f55dcf2eae4f69669cf313b81a2162c23939d
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I0d9f713d91dcc625367355ae2543f08395ef322a
* | Revert "Update commercial license headers to Qt AndroidExtras module"v5.15.3-lts-lgplTarja Sundqvist2021-03-2592-2496/+2496
| | | | | | | | | | | | | | | | | | | | | | This reverts commit fb52d4f97f3fb84a960d85de42c3da49b4020a78. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Ib31edbffb5c0c1f3e592837f947e7f8b3ba6cb62 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Revert "Fix copyright years in commercial license headers"Tarja Sundqvist2021-03-2320-97/+97
|/ | | | | | | | | | | This reverts commit 34686dada1ed61f87eaf8eaee5ca9ba5be4ebdd3. Revert of commercial license header changes is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I0e1cd7130145d7032b150d5d3e3370fa2bc9068b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix copyright years in commercial license headersTarja Sundqvist2021-01-1920-97/+97
| | | | | | | | | | | | Some copyright years were incorrectly updated when the commercial license header was added to the files under tqtc-qtandroidextras. Also, the header.COMM header added to 3 .java files were it was missing. Task-number: QTQAINFRA-4146 Change-Id: Iaf357eedecd5f6b231c939cda1e96d774a7c6a7f Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update commercial license headers to Qt AndroidExtras moduleTarja Sundqvist2021-01-1492-2496/+2496
| | | | | | | | License headers updated. Especially, see src/androidextras/android folder and its licenses that contain external copyright lines. Change-Id: I173aec886a2a7fbfc5f08985570dadc9476e2ecc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I8a05feaf9ab9a953e01345a97d4d5305c3109010
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 04:34:46 +0000