aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I2449424d0f7feb693cf989b0dc4e8c4d04b8d02e
| * | | 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
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-102-2/+2
|\| | | | | | | | | | | | | | | Change-Id: I3413790bf4d8475080caa7dc03634871be003f51
| * | | 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.12' into devQt Forward Merge Bot2018-10-231-0/+2
|\| | | | | | | | | | | Change-Id: Ie43c24df20344cb3b84249e675aacc52429a3868
| * | 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>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: Ic2d289368ef0b43b5500caad1e829f8e2a681728
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\| | | | | | | | | | | Change-Id: I2ceddd2df3ebe455094549807f7eeee5ee211865
| * | 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-012-0/+19
|\| | | | | | | | | | | Change-Id: I73c5694e6796273778d5ff27a16fe8ac87d1e2cb
| * | 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
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I456d123c39c5a79ea5d66c1ac60a5a181a151a27
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: Id86c5209e7b3f1d77208912e37d809f6adc2a08a
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-142-1/+28
| |\ \ | | | | | | | | | | | | Change-Id: I614aee68dea8253732b72e4534750897583aab45
| | * | Delay QtAndroidPrivate::setOnBindListener call until the QAndroidService ↵v5.10.1BogDan Vatra2018-02-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructor exits If we call QtAndroidPrivate::setOnBindListener before QAndroidService constructor exits the virtual table is not set and m_service->onBind will call the wrong method. Task-number: QTBUG-66222 Change-Id: I3d057e33dd36a317c5605d7eb5d6892827ad7b13 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * | Add changes file for Qt 5.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: I52e291483598f7730e3125830078dc997bda8266 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | | Allow the user to easily register a binder creatorBogDan Vatra2018-02-072-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now the users were forced to subclass QAndroidService in order to provide the binder. Now is much easier, the user just pass a lambda in the QAndroidService constructor e.g. QAndroidService app(argc, argv, [](const QAndroidIntent &){ return new MyBinder{};}); Change-Id: I97608f806b311ad3c853a86cde132aea8352349b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: I8b7f34fd95636fb4b0724ca4ad890484dcc522a8
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-202-0/+49
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5b98d2d4fea7b3b6e9c093d35866c4d11aee4dfe
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-181-0/+25
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1370a8ebdfbbcfbf605ed95769dcb600417d4134
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: I5720a38d3b1606860a4aa6901a5ba40283308812
| | | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-081-0/+25
| | |/ | | | | | | | | | | | | Change-Id: I9fb0ec962fb51a222a399f39cca5861c8dbf525d Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I2bdb804fc9c28a38ad507fb9f3a46b8b15aa138f
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: Ie133ba28e789ef8eb2fa998311affd141c13d506
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I21c51d11238fd0e311c038eb7cec5774f717a312
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I2dd6be3c7b4483a8b9ff22e43e0ecf0a0a820471
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+24
| |/| | | | | | |/ | | |/| | | | | Change-Id: I0857b5fb59148daec27ef164d135dfa708734fb3
| | * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-081-0/+24
| | |/ | | | | | | | | | | | | Change-Id: I5c0bb8b9e1a26fb9f64066a828b09a8a0dfad262 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-209-14/+105
|\| | | | | | | | | | | Change-Id: I1f8c55c8647779c972d7d152ecd0c56bdf66a586
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 04:12:04 +0000