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: I0a018cfa3c74b5761b8157625447236a3362126d
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: I80236f8976e24174a1f1a0de950d2f4de1560bfa 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: Ib514c5a20b6e8850bd224e051ae34e266533954e
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: Ied6340d87b5fc97a2d8af72a0c96f84902209a33
* | 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: I725a394729275c5792e9a766e20ff6142ed96f12
| * 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: I258d3f2a3c8a34a1884744576a884835251a665c
| * 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: I7deebe9e42d99cdd417bd20065b2d330a5d0844a
| * 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: I6ecffa13b9646552e153a9d7db092e4ab4312869
| * 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: Ifeceb9dc476e2386006f93f6dceb5864ebe01da6
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I272744bf7b300eed757cf1c0ac40e3ebbdaace96
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-1610-1/+112
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iec7cc935c6371d766b155f7e83f2a0355eccfe79
| * Update obsoleted functionality in preparation for Qt 6Tor Arne Vestbø2021-07-159-0/+111
| | | | | | | | | | | | | | | | | | Functionality that is obsoleted without a replacement will have instructions in the Qt 6 porting guide. Task-number: QTBUG-89564 Change-Id: I82e112bd3bda5942a618bebea8cbdc683241a660 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-06-021-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I12153e6b5756438b6d12626d88d2470a9bf093f2
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I3c7eb78e418355bedca15dd91cc39acfff95cff2
* | 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: Ib3c0c7c160c6f5a8d9e8b58527d7ba723de3231e
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I9d1d752bf56ca9f167367352fa8e7d175f4d948b
* | Revert "Update commercial license header"v5.15.3-lts-lgplTarja Sundqvist2021-03-2456-1149/+1149
|/ | | | | | | | | | | This reverts commit 99c7768ecd408d240d54db45dfe2bb925ce903e3. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Id6f075ae00818fe2238b761e102db634323c56c8 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Update commercial license headerTarja Sundqvist2021-01-2856-1149/+1149
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtwinextras. Examples, documentation files or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4166 Change-Id: I735c35b3d1d0782de411fb9d2368d22b3853b21b Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Blacklist tst_qwinjumplist::testRecent()Friedemann Kleint2021-01-271-0/+2
| | | | | | | | | The test fails in COIN. Pick-to: 5.12 Fixes: QTBUG-90351 Change-Id: I5b166e05603726decfeecf404c3cc6182d1c6558 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-281-0/+31
| | | | | | | | | | | | - 5f1dc16bc686851b45beff6f73925e05698eeb09 Add changes file for Qt 5.15.1 + dc798ad59910173b5d4870ebed9bcfbc39d29b8d Bump version + d1fe52bea1ce58d86bfc639f28d0f533a1570ae4 Add changes file for Qt 5.12.10 + 40584f80388ce8eedc6f557d28eb3767b9b5f78b Fix compilation with -no-qml-network Change-Id: I5c57d0562be53c03c1325c59c7e963963e483a0c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 41f2492a30be21f28c8b0b7b932b886536fc9916) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I51f72139b0f660d2575a828b53f2edea4d1ea9a6
* Fix compilation with -no-qml-networkFriedemann Kleint2020-10-202-14/+27
| | | | | | | | | | Add some #ifdefs, rearrange includes. Fixes: QTBUG-87694 Change-Id: Id66b3e62e75873472a3fb7cf57457ace55c18961 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 0ca6837ad76eb23a0e7c5f9981fdb5b8827a0a3e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I1afbc971f8ba63649449154de27347a46aea17b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 9ec782f24f2a852d351619e174e1bec79112ff43) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I3a5bc52e766dda8c3d347016e915da950f63948d
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | + ed12055dcc8c089bfe88b08842d2f16dd266545c Bump version Change-Id: I44bae61ed0aaed4452438f969c6d5a430cc742d9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 922750e68d1a5967b4bdfef7072779f8c375eafa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I83637014f247836762a16a0d0b29697880e52da6
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: Ieccdad81ad056f271529e437c53f012774f6579e
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: I9eff3b10be0b1cd6b62d08b4039e6390a8048a13
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: Ia7342226c20223daf89ec3691a2c62c046ecb2a5
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I8188351860e4b355ce4acbef55ae3e76466c195c
| | * | Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | + 9beac3cc9bcb1806ad1f8118a70467c122b9e938 Bump version + 0d5ce87e1aeaed361c8d034e8329c0ceca62e42a Remove confusing documentation Change-Id: I2e62e1d75750adeb18f06e44d3e26ab5de487ff2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| |/ |/| | | | | | | | | | | | | | | | | | | + 23fb8fa7d3894d5f93ec5d51461e1366274a0c0b Bump version + 98fea3ae261313b88cb3f67c7f9d3368e635cd51 Reduce QList usage + c23dcca0a0d768f87c1fa164380f1028ce1ee43d Use UTF-16 literals where possible + ed91358ec20bb96fe2eff1b9dfaf772c9b1dba5d Use QNetworkReply::networkError() instead of deprecated error() + d5310efd2fbbe9786a4257f3ada78381cb54da23 Revert "Use QNetworkReply::networkError() instead of deprecated error()" Change-Id: I8237732432111f4594e0ae4252e732fe91d863e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Revert "Use QNetworkReply::networkError() instead of deprecated error()"v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Timur Pocheptsov2020-02-241-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit ed91358ec20bb96fe2eff1b9dfaf772c9b1dba5d. Naming in QProcess is considered to be the correct one and the rule. Change-Id: Iaca8e2661454ace9f73b0fbbae0bf429153f0268 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-181-3/+3
|\| | | | | | | Change-Id: Ib98519d9d455d072e47c85cabd60d2e20cb28325
| * Remove confusing documentationYuhang Zhao2020-02-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWin::extendFrameIntoClientArea: You should set Qt::WA_NoSystemBackground for it to work QtWin::resetExtendedFrame: You must unset Qt::WA_NoSystemBackground for it to work Actual result: Set Qt::WA_NoSystemBackground and then call QtWin::extendFrameIntoClientArea results in a black window. So the documentation of QtWin::resetExtendedFrame is correct. Fixes: QTBUG-81831 Change-Id: I0fafb7049d65fa22eeb1b167a6227042f2fefe73 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I00344b079aeeeac0528f1206ec22a206e482015b
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I57c95c00c9e1a2f8e1ce8f34dd863bc4060f6472
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: Ifc7ee2e0a9c4d2587286c0e850b70788b2d980e2
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I8162b398fcdb68875dfafb7416a5120b263238e3
| | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| |/ | | | | | | | | | | | | + f2dde34d7d97616e027d7e37c7d6ef098723c2a1 Bump version Change-Id: I7441a4780e7546529c16f5b769bd3d900f627122 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Use QNetworkReply::networkError() instead of deprecated error()Timur Pocheptsov2020-01-151-1/+1
| | | | | | | | | | | | Task-number: QTBUG-80369 Change-Id: I9bd16bd0a1bd7a306622db03e012eb408e4bc6ea Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I257eab9474deaac5fec271bbd28fe9cc4ded7d72
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: Id1549cff6ee954aff96f7f92116e612dd1c0ca83
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
|\| | | | | | | Change-Id: Ie8658751efc8bd9426eb98ac8b6a4ea2c4f1f230
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\ | | | | | | | | | Change-Id: If54b6799b82707813d3eabcf0ec69964f6c4da31
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 01:33:14 +0000