summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-162-2/+3
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I11345837577bcf174eec41b7eccae45bc1bd60bf
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I7d98c7ba3e2dbde16dccb65ea988fe0a9a26e6f5
| * Fix QML theme showing totally darkSami Varanka2021-05-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Added check for new theme's forcePredefinedType in ThemeManager's setActiveTheme before resetting new theme's dirtyBits. Fixes: QTBUG-91103 Fixes: QTBUG-65264 Change-Id: If0dd2dfe6a0e179ce8a21de74b3193650f3e76c1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 54e3c62734cb950e08a3f930880d08b9e2854e35) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-073-5/+19
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I0019e044454d2aa0c1cea3774c7632e38484db5b
| * QSurfaceDataProxy: Fix crashes adding the first row of dataFriedemann Kleint2021-03-032-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | Adding one row causes an assert ASSERT failure in QList::at: "index out of range", file include/QtCore/qlist.h, line 373 since there is no first row to check the column count against. Check for empty as well. Task-number: PYSIDE-1438 Change-Id: I225b87b764545b7a430472dc5a4b2e476a26a7ff Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 106bef0493758ddaeadd3b4d744227cb7feadb70) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I48dabb632754d92993bfca313c51aec823764880
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-23212-2332/+2332
|/ | | | | | | | | | | This reverts commit d480e17ae84e1fb053db3de7b39da1bbbb455632. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Ib01d53a31196f00d01544d172a77d9da38280d90 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-27212-2332/+2332
| | | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtdatavis3d. 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 the line count causes failures in tests. Task-number: QTQAINFRA-4160 Change-Id: Ib818c335f5d3c01f57e2fd240e06181d703de779 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-281-0/+28
| | | | | | | | | | | - 6cc736d3f5050eda1173525a3bef1daa6165522f Add changes file for Qt 5.15.1 + a3e04c4fd28e5df09454c17ad5d48211610e73e9 Bump version + c8a251c1834f499c55a616b1ee10f776f068ab8b Add changes file for Qt 5.12.10 Change-Id: I081050097988f7ecbddbd83726d83a88e4dd2494 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 1168c788a117e4556e6cd0ba1e267a86ef62b0c4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I1d2e255315074a993b85a179296e4dd4ed5df249
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: If45bc8a30c11f9d37000d14f4f59536db6a9a828 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit dae7527bee9f86bc0e6254068aeeb908df5a6de5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I04172a3e8f0283ac590271fd05304325cba091a3
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | + fe5eb952c4811adfee9ef7e37463039d879774ff Bump version Change-Id: I0393073328499d305f7ab1c35a0886749189d06f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 09801264493e1b2ceb4918be59a13dde1a24d882) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: Id902190880c18e9580e7f1b8f4a2765853d90edb
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I393d29005bbff24389a2558cad1ad67dbdde0ca8
| * 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: Id46db73bd6d94dc879657086663594436bd36c7c
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: Ic8fe0e6ff9f0ee51615a9b1582f6d48df6907f68
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: Idec69f0f9a6dc4f57e7e8d040f5658601e053bea
| | * | Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | + 0b6024b853da4122a427d1edd1e009d175b1b80a Doc: Fix typo in qdoc command + b255d8923ba5eb8435485c1fab3f8d563ac4837c Bump version Change-Id: I5af5cb807ea65de14434c8f31c73f34a578c07ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| |/ |/| | | | | | | | | | | | | | | | | | | + a54a5a253fce25d0ffa215996a3cdf2fca8b06bc Bump version + 309066052eec6cafa8ef7ac5d165fe328ef0e509 Avoid initializing QFlags with 0 or nullptr + a315402ab232e3e4398f0b1c1d6910bdcefaec4f abstractdeclarative.cpp: Fix deprecation warnings + ebb48fa6be3aeae6915da7ec30311a0e439a0720 Fix deprecation warnings + 407bee91eb83b6ff2df6e5d99366971bf21e2637 Use Qt::SplitBehavior in preference to QString::SplitBehavior Change-Id: Icff9f191797dd8d615765f3b8bc38fdc938ac237 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Edward Welbourne2020-03-022-2/+2
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: Iee6bd8e83592c26b63259959e58d52131921438f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-180-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If0a9a36e4d9fe5151014dded02559ce60f2eae32
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I9794d24e2f1ce6b04da675acdcabcd66deccd132
* | Fix deprecation warningsFriedemann Kleint2020-02-173-3/+6
| | | | | | | | | | | | | | | | | | | | colorgradient.cpp:80:61: warning: ‘QQmlListProperty<T>::QQmlListProperty(QObject*, QList<T*>&) [with T = QtDataVisualization::ColorGradientStop]’ is deprecated: Use constructor taking QList pointer, and gain improved performance [-Wdeprecated-declarations] declarativerendernode.cpp:116:71: warning: ‘QSGTexture* QQuickWindow::createTextureFromId(uint, const QSize&, QQuickWindow::CreateTextureOptions) const’ is deprecated: Use createTextureFromNativeObject() instead [-Wdeprecated-declarations] customformatter.cpp:167:34: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations] Change-Id: Iaf3b8814cd70a704b87b4970ad83ed5a7d4dc0f1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-01-282-1/+21
|\| | | | | | | Change-Id: Ie1823c477a005d44d7b12d1e6d9228d89b619298
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I366104c6fc4c8097326241662592e53da6251a3a
| | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-101-0/+20
| | | | | | | | | | | | | | | | | | | | | + 86efcb0bea7a9df8aa8be2c836e1a2f7da25fd3a Bump version Change-Id: I67a2381681fdc5378235510a60038df3789b6355 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Doc: Fix typo in qdoc commandPaul Wicking2020-01-271-1/+1
| |/ | | | | | | | | | | | | Fixes: QTBUG-81676 Change-Id: Ibe7f73e1fc529411ca92d7bdbb2ad8824cb97a62 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | abstractdeclarative.cpp: Fix deprecation warningsFriedemann Kleint2020-01-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | Use QHash::contains() instead of checking for presence via value(), fixing: abstractdeclarative.cpp:681:48: warning: 'QList<ValueType> QHash<K, V>::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] abstractdeclarative.cpp:694:45: warning: 'QList<ValueType> QHash<K, V>::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] Change-Id: Ic858949514a647f62e74bff6ece346851dce413b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If5cf8cef472f062899993c6bd69018df1953c5bb
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: I1b5fa87d115b2e3f74392d373841a6349bd0ce69
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
|\| | | | | | | Change-Id: If81fffe1cbdb10b14fc762fdb9c6634680ba75b5
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\ | | | | | | | | | Change-Id: Ie62ba04e425b7ebf5cfe48f0addac351788f23e6
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-261-0/+18
| |/ | | | | | | | | Change-Id: I133417c323b961271be94ca5672c17295989a446 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-262-15/+8
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I38e6bc29ac03108f56f445069b2dbbe8a3db201a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\| | | | | | | Change-Id: Ib7ba82cc6f1a30e8f026cea8da5b36d8201db7de
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9404bf15dd2321957603feb1a605f7b50724cbe3
| | * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-151-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | + b0114f0dcba2d1709aac47530febc51e5078593e Fix GCC 4.8 build of abstract3drenderer + 3858190b2b2e71a7b63e9976da2b22f1c342e3b3 Add changes file for Qt 5.12.5 Change-Id: I9f7ee8e553b55d87a4695f71af7411aa1bcbfaef Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: I01244127c6025b18b32ce40648f4d1de4a5fc0ff
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-011-1/+277
|\| | | | | | | | | | | Change-Id: Ib04f91529d95b1268bfd470fa88e00dce866121a
| * | Update plugins.qmltypes for 5.14v5.14.0-beta2v5.14.0-beta1Kai Koehne2019-09-301-1/+277
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: Ib264cb0294f02e2983cba0041a48ff87b7bc4f51 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
|/| | | | |/ / | | | | | | Change-Id: I65642f3568bcb7873893beb85cb88a7f07a2eed7
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+40
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| |/| | | | |/ | | | | | | Change-Id: I33d39a00a4628baeda098ce5e8665307617ad789
| | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| | |\
| | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | |/| | | | | | | | | | | | | Change-Id: Ia2b7db2f249f6606629a2df3a242176f97559417
| | | * 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: I7c34d832f81f7f96ea7d3fe56a25722a3a161d4a
| | | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 Bump version Change-Id: I7ae9ff4d484931d90fe4d7fc5c7998dd71e69dab Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 05:07:45 +0000