aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.10v5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | Pick-to: dev 5.15 5.12 Change-Id: I3db1230ec94f2f04646f05e76152ad90292addbf Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionJani Heikkinen2020-10-141-1/+1
| | | | Change-Id: If351ac344b62fc07c4759bd1f0e078db5ab1479b
* Merge remote-tracking branch 'origin/5.12.9' into 5.12Qt Forward Merge Bot2020-06-171-0/+20
|\ | | | | | | Change-Id: I9c7e877208f06f3f5ca034503a0113acf1e6ffb5
| * Add changes file for Qt 5.12.9v5.12.9Antti Kokko2020-06-051-0/+20
|/ | | | | | | + 345ac1fbf3819caa8d9822615573a374f918f549 Bump version Change-Id: I382f5f90e96eaa81126fcabbc9ad1363fd12b98f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Bump versionAlexandru Croitor2020-04-221-1/+1
| | | | Change-Id: Iffe1d6559f7eecc2a64c8c91889942ab3a455564
* Merge remote-tracking branch 'origin/5.12.8' into 5.12Qt Forward Merge Bot2020-04-141-0/+20
|\ | | | | | | Change-Id: I4caac0c93816a072f8fab54a76f068cd729670e4
| * Add changes file for Qt 5.12.8v5.12.8Antti Kokko2020-03-171-0/+20
|/ | | | | | | + 39e0a9d14acba2c0d3e31db0a84b67f15bb6713d Bump version Change-Id: Ia8bcd13d6b745ed237fa95c8081214b34ff297de Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12.7' into 5.12Qt Forward Merge Bot2020-01-311-0/+20
|\ | | | | | | Change-Id: Ib2f8ce4dba3c85e1b1de8e0aebab546fcba4bcef
| * Add changes file for Qt 5.12.7v5.12.7Antti Kokko2020-01-171-0/+20
| | | | | | | | | | | | | | + 5be220966d28d01e2e879a1a3b63d7bacd41fbc1 Bump version Change-Id: Ib944e52bdfd74a7b1f745425ef21468992f60d71 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Bump versionAlexandru Croitor2020-01-281-1/+1
|/
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-071-0/+20
|\ | | | | | | Change-Id: Ib423c0e634811450ce9ba7d8cfd62741a1217e80
| * Add changes file for Qt 5.12.6v5.12.6Antti Kokko2019-11-051-0/+20
| | | | | | | | | | | | | | + 45d22f05c50507f86679c34cdfc6c8e689618f10 Bump version Change-Id: I7ac0631ce17917db7d34c9be457dacb5cb258741 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Bump versionFrederik Gladhorn2019-11-071-1/+1
|/
* Bump versionFrederik Gladhorn2019-10-301-1/+1
|
* 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>
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 01:24:14 +0000