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: Iac8ceb27263c9d9b99c9436666c6976f6e820530
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: I6f48a1936926457d97fcd097974514c14e116797 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: I1f21eb8cd5ca42156c15f8dfb3c7c9d61d7f62a3
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: I6089b3e32da03bfd8c963b35ca8733f90b6be1e5
* | 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: Ide635c90531740fd89a2323c2e6b34603586d40c
| * 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: I96778c64a0b4b0de63745d23674be943e5ab5f30
| * 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: Ib6c5ca6e94c562b5a03867981acb7cdf7fb9a548
| * 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: I09e09ec932d98f19fe068fa1c63ae300b6e79a92
| * 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: I4e5395772ce0e628b404b11c76073c0d81206330
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: Ia1835e14965c29d2217d52c4ba52255471a97d1a
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-166-1/+9
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Idca6a0f78bcb543d55d7bd0d70c99d1071af484c
| * Update obsoleted functionality in preparation for Qt 6Tor Arne Vestbø2021-07-165-0/+8
| | | | | | | | | | | | | | | | | | Functionality that is obsoleted without a replacement will have instructions in the Qt 6 porting guide. Change-Id: I2e456abf7029244553c5157c6d9f018a968e3655 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@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-05-161-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Idf8eb7b6744e82c8077b96ee06173c9b4bba7915
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: Ic6bd09bd6a8f8a318081e0bc700e0b382de62a29
* | 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: Ibc6f5a54904c88e1da5d8c7766062639e5043bdf
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I9d7ff99be253c61eb85b8a432d19c92d1db39325
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2318-376/+376
|/ | | | | | | | | | | This reverts commit fa52d41e3861715ec2418225946d56e39d783900. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I6e9bea104d5cf5289152fb592273f31f0b3bcd7d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-2718-376/+376
| | | | | | | | | | | | | | | Updated header.COMM to the file in tqtc-qtmacextras. Examples, tests or documentation files 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-4169 Change-Id: I6a50040df036bb22491ee8acca04a72e476224dc Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Deprecate QtMac::isMainWindow()Tor Arne Vestbø2021-01-261-1/+4
| | | | | Change-Id: I73cdba03f1b02c5d14f9edc2a9c2dbfdb377ad10 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-281-0/+28
| | | | | | | | | | | | - 5047b76dad3078875d1aea357fbd5378f56bf340 Add changes file for Qt 5.15.1 + a8bab12c0331b54a78deac921dacbc9f8f53a3bc Doc: Fix documentation warnings for Qt Mac Extras + 7fa49a1c639e6174f25ed570bea0f3cd261c2fc9 Bump version + 7fd8ca9462dddb89674e70d86e86c54c890d832a Add changes file for Qt 5.12.10 Change-Id: I75d07a17bb14132db532d5768a1e33da8634343e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 65f500c488c593486c6c390f53497dfbce1b58a6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I9901052653801446a76d48e80a63010124ec1f2d
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I5e7b4193055ec1159bcf95b11faca71d0b4f8425 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 1fc8c238f362ee44799faf38ad42ebd269b3d4b1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I73c7dd6734764ce176037f8e8791e501f6c60de3
* Doc: Fix documentation warnings for Qt Mac ExtrasTopi Reinio2020-09-103-6/+18
| | | | | | | | | | | | Fix namespacing for \fn commands, and mark deprecated functions correctly with \obsolete. QDoc doesn't see Qt's include paths for this module; work around parsing issues by omitting include statements with the Q_CLANG_QDOC macro. Change-Id: Id7a65aba0dc5d7e95825cff76b10ec1f46a530ef Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | + 8a8ae8fa2c8cfc94e06a3da0a260ffbae6c7e836 Bump version Change-Id: I2ae16221c5120987678512e3b15547053f393f6f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 3a2179850f4d67d1f822d30991a9bce33032da73) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I1e32c01f09760215e92ffb4b0b1762e4da0e7194
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I2bd11b9651a933b66c82c6561fc63755e9b0774b
| * 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: I2bb6d5b706db1adf3095ffc20ee7bfe3171811cc
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: Ie97b3032f8cf94eef4d9f6b7c48b9b81958724ad
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: Ib7c67f72f02b90afbf810f8e33c97880d2b7d2b1
| | * | Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | + 8245e27d9b5e395ddfeebda39cef2b5e1b8c8d51 Bump version Change-Id: I81b1ee0ba3574ddf607b142cfc8cec8fe6606cc4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+18
| |/ |/| | | | | | | | | | | + 313512c1108dad5705c32f554d74a5bf99104ac9 Bump version Change-Id: I5deca0ac539b5ae2243cd65f103d01dcb8930660 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibf12c6680efff9c49275ac912ad7a1597bd87bc3
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: If4d510c0d7b47db12ed1b4d316c1788b20209362
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: I54cb8492bbb9b7810a0acf86765c5c251383a73f
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: Ib2d73e1105b099ba48e81a1fa6a5f560b862d39c
| | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| |/ | | | | | | | | | | | | + 96448f719d32816f2af1461a08335cd3ed602db2 Bump version Change-Id: I564258f4189f63b5d2335dbb4706b7ca119385fd Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie6fb5a37701cd4ad437eb1a78425299707553f99
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: Ibd81255065ffa02666f09a5428f7a65e3befa110
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
|\| | | | | | | Change-Id: I75c9dddb0ff0de66395cb67d0e9cc6825e4dc2f8
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\ | | | | | | | | | Change-Id: Ic4667640d5358c48511f9e2f212762d74506e03e
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0Antti Kokko2019-12-041-0/+18
| |/ | | | | | | | | Change-Id: I5782e2ef53081e88691294e532cf28b331db31ec Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\| | | | | | | Change-Id: Ia47454049dad96db07696e400b9b48b3c31ad316
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-rc1v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8a8a5ceaf4122dffdf5d8a7ed8ade6e21289899b
| | * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | + bf2fe74afe29fb5bb1b39943f7c5c8a106ae47ee Add changes file for Qt 5.12.5 Change-Id: Icf2ac8b90ee2817483947f3df9c82023178cf60e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>