summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4fe048f05e7838a2eded3d63537691381d97cc5d
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: Ie450d3b50319d448da0adcc2985888a48fa4d084
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-241-3/+3
|\| | | | | | | Change-Id: Ifa3fc40868d8778b28a87b0ec29e6fb813aba75b
| * Doc: Fix broken code snippets in Getting Started/C++ documentPaul Wicking2018-07-231-3/+3
| | | | | | | | | | | | | | | | Add missing closing parenthesis and missing semi-colon. Task-number: QTBUG-61834 Change-Id: I93ebd776305ce36f244a69d7379f27392c3addbe Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-301-0/+1
|\| | | | | | | Change-Id: Ib4e5825baab99b83835350992139e8eafcaa4b9a
| * Fix shadow build for androidMårten Nordheim2018-06-271-0/+1
| | | | | | | | | | | | | | | | (On Windows at least) the target folder has to exist for the IInAppBillingService.java to be created/touched. Change-Id: I0364012a76019a4db010a7b8a9afe178a80f0e16 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-234-3/+27
|\| | | | | | | Change-Id: I9fd486c8e1fa1f81a679e1e2c83254644c78a84d
| * Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into ↵Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | refs/staging/5.11
| | * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I25d8126313624bdcece218df1a816bf5d7ebe146
| | | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-131-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: Icd5131ec54c2f3604687d32d8604fffdee0461af Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Doc: Add missing dots (qtpurchasing)Paul Wicking2018-06-193-3/+3
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I5e545bd91a520113f98265860da688c4451ef586 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-162-0/+48
|\| | | | | | | | | | | Change-Id: Id0ad4833f68e581391fae03903bcfe4cac6d3b39
| * | Add changes file for Qt 5.9.6Antti Kokko2018-06-141-0/+24
| | | | | | | | | | | | | | | | | | Change-Id: I8ff3ef80bf5a3c16bc9eed2196356ea762bbc754 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 064be1023057f83244dba7342978026897fddf0f)
| * | Add changes file for Qt 5.9.5Antti Kokko2018-06-141-0/+24
| |/ | | | | | | | | | | Change-Id: Iddb1240796386d2f06b89a41f92e6b2a2b23001c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 60fad5090be1f646ddab2aec754f3268feb3d8a4)
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-040-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id0a090bb696fcfda0d040e28992941c9fffc5558
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: I6da28a16c71a1a90c0c78df9b1147bdc0c2aed7d
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\| | | | | | | Change-Id: I560635061d9e3d391c0f3911fe0c195adde91244
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: Iee1915bdfb222d9c8d9cbb92721d943a17c2a826
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-211-0/+22
| |/ | | | | | | | | Change-Id: Iff87b0c25729481ecb8e22cea488186368e2288d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: If7daf670077691384b92b8768becd45d368c326b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-311-1/+1
|\| | | | | | | Change-Id: Iabbc94fb8b118e86fef17d4772e24bace4e1870b
| * Doc: Fix Q_PROPERTY documentationv5.11.0-beta4v5.11.0-beta3Topi Reinio2018-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | Clang gets confused about the space between a type name and a pointer qualifier in a Q_PROPERTY macro. Removing the space fixes the related documentation warnings. Change-Id: If2ad8191bb7d0f83be78e927c385442323b3f585 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-271-0/+26
|\| | | | | | | Change-Id: I784ebf7810ddfdf56b3d76d99b77ae03b448ee6d
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia21e7f1c9d51776bd2ab554fbcc55afdad9f1635
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: I29ff769e0f388f17317e5c24f8354cce4a0c2af3
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
| |\ \ | | | | | | | | | | | | Change-Id: I4a822998321763d2fb959631cbd467275da5f5e8
| | * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: I77ac7996f4a51f0f45d65847ee9cabd93a54bd53 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: I63938816a81916fa8fea196d07bcd0125639db78
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-205-2/+82
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If0d163e84e99eb29b55a341df2dee59c46561adb
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-183-2/+32
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If135b3be3bfe1d9c44c44dad9f006161a6c7dc19
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: I7f6696d7d52aa95b0b932db699b72287f14fae09
| | | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-081-0/+25
| | |/ | | | | | | | | | | | | | | | Change-Id: I1ad71852f0642891f4d7680ef7e8688149b88430 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I027688bb22f82da89adecfa071dbf3af1421a19b
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: Ic2ee98d0ae58cddacf48b89c400569e8a980714b
| | * | winrt: React on failure in LoadListingInformationAsyncOliver Wolff2017-11-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64549 Change-Id: I8e509674fcca4ba22b734663590b521c59ae7f7e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| | * | Fix the build on tvOS due to an availability declaration bugJake Petroules2017-11-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64531 Change-Id: Ie52e896d9f6b57be5ce3e2ec8e5d2bcd05f8575e Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ibb51320e099ceefd8751bb4c6b8a3061c7699f20
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I85b4d98107f564ac4e885660df1619dfef41c912
| | * | | 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: I62e53f87d707ed0fb724232823d42147eb9528c4
| | * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-121-0/+24
| | |/ | | | | | | | | | | | | Change-Id: Ic7a4ac222b14fd936c107455888290e317e20cc5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-201-0/+26
| | | | | | | | | | | | | | | Change-Id: Ic334978b4762a50c20621a6c84de9f1d315d7320 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-204-12/+50
|\| | | | | | | | | | | Change-Id: I8941064bdfa99f97e22ad3ad0cc9003d8348b415
| * | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-031-1/+1
| | | | | | | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-301-0/+24
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I47ffb2c1c55cb588441dbc11887dd6d0d39eb665
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: I8fac54be4d81665a119f9bbac0345165b0ec600e
| | * Add changes file for Qt 5.9.2v5.9.2Antti Kokko2017-09-271-0/+24
| | | | | | | | | | | | | | | Change-Id: I90f8ed6f5c1577a5398d47f40daca3106e24feeb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Android: More informative error string in some casesv5.10.0-beta3Nuno Santos2017-10-192-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices will fail synchronously when trying to create the buy intent, instead of calling handleActivityResult() with the result. When trying to purchase an item already owned by the user on a such device, you would get a purchase failed signal with a very generic error string, as we assumed this could only be caused by a system error. This patch improves the error message by including a description of the response code in the cases where the system returns something usable here. [ChangeLog][Android] Added more informative error messages when the purchasing subsystem was unable to create the buy intent. Task-number: QTBUG-57700 Change-Id: I6328b38b33edf4c1c53d2465bf2205c970bf7e78 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-264-4/+4
| | | | | | | | | | | | | | | Change-Id: I8dd6cb2bdc4d08ece32a3eeecbbd099a61abd9ef Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Android: remove support for local/debug deploymentJake Petroules2017-09-065-66/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the pre-dexed JAR files activated by the absence of the bundled_jar_file CONFIG option, as versions of Android >= 5 no longer support this deployment mechanism. Now, the "bundled" JARs simply become normal JARs containing class files, and are neither activated by a bundled_jar_file CONFIG entry nor do they have a -bundled suffix in the file's base name. Task-number: QTBUG-62995 Change-Id: Iff3e00c9c6cf0f8916a0d3f40f340705ae4e8c20 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Bump versionFrederik Gladhorn2017-09-041-1/+1
|/ / | | | | | | Change-Id: Ia55002999145b0d5489acdba095492ec9c32d456
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 17:11:07 +0000