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: I2a245eb273ea29b372fbe2d3e41349df58de8d39
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: Id79bb53379d84d50a3b17910ffa95bcd1a6db1bc 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: I9ac4d2a61353bf3975ec592584799d41b908de91
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: Id1fe941d4868aa05770539a63e62838ff8f3effb
* | 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: Ie56678304a1c438f054229e6fb4f2629dd793f1b
| * 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: If3601534e23aec7d09561872c542a852e09d14f1
| * 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: Icaa1a1a9def26fc7a25c3fbf8b6eb935906a7161
| * 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: If3b6d10a2dc6b00dc7ff1cfb668ac4cd9179f620
| * 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: Id6bafa48f0dc0a99b088fa812587bd6796728463
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I71f31c56912a83da4de1cc6af61b30ca5791a29b
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I69121d227681c43e91ccacf155be4a01bd449bd7
| * 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: I2e45a37a16e97bccf8fe7457257238fedbe72d66
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I13fc844701d7f38a5693d39ffb6047384676fbdb
* | 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: Ib0f1b7c4cdf26571af2506fd032598fcdf92e266
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I54e59b510045b17c50ded4e4b330652032c680a2
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2349-896/+896
|/ | | | | | | | | | | This reverts commit 6cee6cddce42b3b46ffba6e4445aab2d1ed48de2. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I438a9d935d20c2d41edd29213c636e6b3e4518ba Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-2749-896/+896
| | | | | | | | | | | | | | | Updated header.COMMM to the files in tqtc-qtgraphicaleffects. 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 autotest use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4164 Change-Id: I8eed3e1c06dd0c742026bac476ba7832ba5c29da Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-11-051-0/+28
| | | | | | | | | | | | | - ac1dac7099c9552a60da3240134ddbd8bc4fe048 Add changes file for Qt 5.15.1 + d53af701d166dac56c910319db9eac4b9aa4538d Fix graphical effects on images with no dimensions + a3b37bffa4083eda2666f369cacdee69371b27d3 Bump version + 82859f6d41d741c43c4fd6c089526701028c9495 Add changes file for Qt 5.12.10 + 9bbfab7facc78d0ba6b41794e6003fd4bcccff80 Fix effects for dynamic source item updates Change-Id: I676c065ad143baefaaac9d63a16835fbeeb4c061 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 66b7fbaca4b323dce337e87e3093c8836577c561) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: Ifaab53d733205181ee7e9a661cf29ba83764976e
* Fix effects for dynamic source item updatesEskil Abrahamsen Blomfeldt2020-10-212-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d53af701d166dac56c910319db9eac4b9aa4538d aimed to fix graphical effects when the image source was cleared programmatically after the shader effect had been initialized. The fix made the assumption that the source size of the proxy had been bound to the size of the input, but this turned out to be wrong for many of the effects. Further investigation revealed that the graphical effects were never written to support source items with properties that change. For instance, if you initialize the source image with fill mode == Stretch, it would pick the direct throughput mode and this would stick, even if you change the fill mode later on, causing rendering errors. Similarly, if you dynamically add children to a childless source item at runtime, the effect would not be applied to these items since the proxy render mode is required for that. d53af701d166dac56c910319db9eac4b9aa4538d was only added to 5.15 because that is where the regression is visible, but it turns out that this is a general problem in effects which is also visible in Qt 6, both as rendering errors and also as unpredictable performance implications, where the order of operations can decide which mode of throughput you would end up with. The fix is to redo the polish whenever someone changes any of the properties that might affect the choice of code path. Task-number: QTBUG-86486 Change-Id: I4af494a7a7fabe496e2d3442084cb823ec177b04 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 3a7181de414b4952ac93e9f148a98f7e69773718)
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I4e2915ecabf9d8b8e495a09d56c569f01e88ded0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit fabaae2f8039d9f12e8531e2dc215b24ffe8d445) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: Ie344085b42f37a579af0fbf763e79b94ff0cc1f6
* Fix graphical effects on images with no dimensionsEskil Abrahamsen Blomfeldt2020-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When we pick the direct code path for a null image (if you set its source to ""), the shader effect will try to sample non-existent pixels and get black. Whereas if we use a proxy for this, then it will create an empty source item the size of the item instead. This used to work by accident before 3c4c7ac6069a57b17199627742d8e2b32a3a31c9, because the interpolation was always set to the wrong value, so interopOk would always be false and we would always use a proxy. But after that was fixed, we started hitting the direct code path and null images broke as a result. The easy fix is just to go back to using the proxy item code path when there is no actual input. Note: This is only committed to 5.15, as the same issue is not visible in Qt 6, when running on RHI. Fixes: QTBUG-86486 Change-Id: I1b7927fa1a407f70703e8c4fa380c1c3582c0aaf Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-09-031-0/+25
| | | | | | | | | | + 83e9a15a523e86718f99d47d5b3b516ab95d5ae2 Fix gaussian blur with non-integer device pixel ratio + c1d206d0c30925c2bee248e2c5a33b22abf72a94 Bump version Change-Id: I64c164b4ccf7e4db056d03486511c26c1b095b2b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit c343d7746b0331af722d69f3b5b47840f57a4cca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I5ac612bf97004e2d22659d2fadc4aaa1bf7394d1
* Fix gaussian blur with non-integer device pixel ratioJonas Karlsson2020-05-181-1/+1
| | | | | | | | | | [ChangeLog][Gaussian Blur] Fixed an issue where the effect would be broken or incorrect if using a display with a non-integer device pixel ratio. Task-number: QTBUG-82830 Change-Id: I108426f5dfcddbc58dad4b3ba8e5b9c9dee9c8e0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit d08c7f3aaa6d27e283ae8c2b89ce9ee790264049) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I61c081376c321cd9e4b798009c0484dfddf72ebc
| * 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: I11277d3c66139cfa2a99f0657419cc0e0ba57674
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: I3c09f5e2ef21edfd53b34119ba1343ff5a50c6bc
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I7b2d47bf5a134da8f9f30831161772c4f6969282
| | * | Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | + aca14b548477a00028a99d8acf184ec5c6403d95 Bump version Change-Id: Ibef77cd427066e4263185aee11986b9583a431fd Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+18
| |/ |/| | | | | | | | | | | | | + eff2627a4e367ab73dc48942be1cfc4247407df2 Bump version + 617bb58eb0b381ae6095fe8947bc7f9e25ef85b1 Update plugins.qmltypes for 5.15 Change-Id: I00c3a62c112600ee642d6fb30ffd2ddf6bae737d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Update plugins.qmltypes for 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Jani Heikkinen2020-02-251-1/+1
| | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: Ice366969cb78b6229ecb311362292da2d02dbe55 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5dd7cf122561e2f518800227654b0647de8b992e
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: Id6882b9b69f9c9e77cb5e42be1af1db01c411a03
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: I801c684d1c683f7b6b635be5a10112f6d0126368
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: Ic33db80df32e5a32d777b994723975358162a68f
| | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| |/ | | | | | | | | | | | | + ee9d746eb967a8b561b58ea51da027328f1f3d8a Bump version Change-Id: I4b56f86d3aaad3db84d3f7e4fdd6f89d46dfff67 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: I98d336174e4887b89e51eda825c220cb84b6dd2f
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: I95ecb91e94751f90db5978a6dd0a3aafbbf0d397
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
|\| | | | | | | Change-Id: I3bbe4da9ac1c881f426f1c0fc1a550575825669d
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\ | | | | | | | | | Change-Id: I8c256420f3ad4bd1b38c23f87b34775758503fd1
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-281-0/+18
| |/ | | | | | | | | Change-Id: I61dec28eeaba2674917a51255fd2449b77a13c88 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\| | | | | | | Change-Id: I9091150854587a514cfa1dad6c420655e76f16da
| * 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: Ia6fb4be261489376a86850e4592c517e1f95c661