aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: Ifd7042806466af25857251274117de49e670118e
* 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
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
|\ | | | | | | Change-Id: I77b4a679ae04cace49f5494dc3e575a80ea0ed16
| * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-021-0/+20
|/ | | | | | | + 5e920ecff160ddf7374023802918385ad699d786 Bump version Change-Id: I6e4a23bb6e21fd8cca139a3116b2830166ce6991 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: Ie66684179cd4709af36beaab6b006a6d979a9403
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
|\ | | | | | | Change-Id: I21c4a24c2f543c20bef4bad822e660c4f4c062d7
| * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-211-0/+20
|/ | | | | | | | | + 478d964cac7654d36ccfe5882dd09075bb85442d Fix class vs struct mismatch + 82fbed7445875678ab4b3d29fed89bbfcbf890fa Bump version + dc74de8db874c49c314a2bd475afd5955ae8f83b QtAndroidExtras depends on QtGui Change-Id: I07201cd438222b3282d0868f1db6dc019d9aaea1 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+20
|\ | | | | | | Change-Id: I3ef109cd2a96f9936c23ecb62c8bd157b8942dc4
| * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-131-0/+20
| | | | | | | | | | | | | | | | | | | | | | + f611299f839d0af346ee202385d7c9bb0b19c1af Doc: Get rid of QT_INSTALL_HEADERS in documentation config + 16d33f91eadadc63e4a999fb175ed67b3321e9b7 Bump version + 92f9b785a97de43f53b8d521034877a3203384fa Bump version + 328418b07dd6f530095008f8a062fa50d2731fe3 QAndroidIntent::putExtra: Fix JNI return value syntax + 48256a153eefaeb772d3be97b0c19e3402e0e027 Bump version Change-Id: I11a8e7e46809fbffbc1777126d5fd171a9f76b74 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | QtAndroidExtras depends on QtGuiLiang Qi2019-01-301-0/+2
| | | | | | | | | | | | Task-number: QTBUG-73367 Change-Id: I0581f3a644304d82eead4e39b79340912db9b17e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | Change-Id: Ifc60128046aeccdb0503a2fecc345d8633416956
* | Fix class vs struct mismatchAlex Blasche2019-01-081-1/+1
|/ | | | | | | | | | | | | | | | | In file included from qtbase/include/QtCore/5.12.0/QtCore/private/qjni_p.h:1: qtbase/include/QtCore/5.12.0/QtCore/private/../../../../../src/corelib/kernel/qjni_p.h:68:1: warning: 'QJNIEnvironmentPrivate' defined as a class here but previously declared as a struct [-Wmismatched-tags] class Q_CORE_EXPORT QJNIEnvironmentPrivate ^ jni/qandroidjnienvironment.h:50:1: note: did you mean class here? struct QJNIEnvironmentPrivate; ^~~~~~ class Change-Id: I0df1a4350c50ca920ad7f13978a62913a9702a15 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Bump versionKari Oikarinen2019-01-071-1/+1
| | | | Change-Id: I85bf9edbb6376c2e1d7b08b5c27ccad52d6894b9
* QAndroidIntent::putExtra: Fix JNI return value syntaxAlbert Astals Cid2019-01-031-1/+1
| | | | | | Change-Id: I8e9d534e8752466c57d79cbb136c4dec01c8695e Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-12-230-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I528aa22d5604aa3ba97f11dc69fa0025966ed0ef
| * Bump version5.11Kari Oikarinen2018-12-121-1/+1
| | | | | | | | Change-Id: I4e7839bb82da9951fb090ae5afb3f219b28ced72
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+23
|\ \ | | | | | | | | | Change-Id: Id177e0690562ae5dbf037f2162662a666ffd506b
| * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-071-0/+23
| | | | | | | | | | | | | | | Change-Id: I8ef16c14151f4a5b7f8c86d3bc37cb59adc2a940 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I380b4543ef9f6fca375f61c227dc628d9a61f906
| * | Bump versionv5.11.3Oswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: I505326cbfc5f8ace2233cf63cdc6d072e5c0e058
* | | Doc: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-072-2/+2
| |/ |/| | | | | | | | | | | | | | | | | The use of QT_INSTALL_HEADERS caused documentation build failures in certain configurations. Use an alternative method to pass the required include paths to QDoc. Task-number: QTBUG-67925 Change-Id: Ia8c25b0cfb950f43ec60a3768cd192588a5e5617 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta4v5.12.0-beta3Qt Forward Merge Bot2018-10-201-0/+2
|\| | | | | | | Change-Id: I88b7094f8b625c14f2524576e73cf7fc3f807a1d
| * Check if the array is valid before accessing itAndy Shaw2018-10-191-0/+2
| | | | | | | | | | | | | | Task-number: QTBUG-70284 Change-Id: Ic2a0613f3f57661e8c6b4665cefbd6dc73fd37f3 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta2v5.12.0-beta1v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\| | | | | | | Change-Id: Ic5109cf17a132060a59a6f25ff06e0e804ba75f5
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: Ie87f646bcd3d14df01fd56ab4fb2cdb054270829
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: Ic26762dd742e9a467b73fe12508e55d723cff65f Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Allow users to find all classesBogDan Vatra2018-08-292-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | QAndroidJniEnvironment::findClass is a convenient method needed to find classes in all class loaders. [ChangeLog][QtAndroid] QAndroidJniEnvironment::findClass convenient method to find classes in all class loaders. Change-Id: I23c9e8a02aa7ca02cf707be5548ce1f8bb555dd7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If16713447ac1192606cee870cd7b9e5e48db8578
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I22371e8c74312031e115808d6f209dd8727bd357
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-171-1/+1
|\| | | | | | | Change-Id: Ib5147f11d0577e81423abe38c484e92f6dedd594
| * Fix startIntentSender Java signatureVolker Krause2018-07-141-1/+1
| | | | | | | | | | Change-Id: Id585a4f8fb21eb263a601857b47e3fcfcb2c7f4a Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-0/+24
|\| | | | | | | Change-Id: If784cb6a5f932f76866108e59124296fc59467f4
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: I2c2449422d4c8497ba6aaf6a408e644afe5d6d8e
| | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-121-0/+24
| |/ | | | | | | | | Change-Id: I033600c017ed10cce1e370a48d4ac1b69f895697 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+48
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I84bdbf3db54c1e9a524f12eaa232f01605ee1294
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: Ib1bb8832b905ba0ac7c32743188d063b36b00fee Reviewed-by: BogDan Vatra <bogdan@kdab.com> (cherry picked from commit 5dade229ca69cb8a09fcae20c9a23db3f3057fdd) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: Ibf1a217b26d49b6f2fda32763da25b10bad33310 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit c20c722f7617c65fd3ef43d1c55626983ac594ef) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: Ifdcaefe4ab09c70680259723f191d4ad05d16224
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\| | | | | | | Change-Id: Ie468757f56375662b179178c34cb8df2cf167d0f
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: I42b5f9236e520590616c0c885b7c54bd6f155f42
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-241-0/+22
| |/ | | | | | | | | | | Change-Id: I710a2b1442838d4e8aa42d3bd74eef44b5504991 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-149-19/+101
|\| | | | | | | Change-Id: I36126a1e595284948bc989d7333a5c05c6fd3539
| * Doc: Fix documentation issues when using Clang-enabled QDocv5.11.0-beta4Topi Reinio2018-04-119-19/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc in Qt 5.11 uses Clang to parse the C++ source for documentation comments. Unlike the old parser, Clang requires a module header to be present as well as correct include paths to generate the docs correctly. However, these are available from the build system only when building for Android, not when generating the documentation on a system with no Android-related assets. To fix this, create a 'dummy' module header specific to doc builds, add required relative include paths in .qdocconf, and fix the documentation \fn commands to work with Clang. Change-Id: Ia3d4e50ff8756cd8c8aae9cd3c3d1492eb7db328 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-273-6/+55
|\| | | | | | | Change-Id: I89c7a29aa5eebd575cbe816846aba353dcbc6d54
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 22:05:29 +0000