summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-080-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I14f893e94942c900f26ea76d36717562ef3d4397
| * | | 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
* | | | Remove QT_NO_LINKED_LISTSona Kurazyan2020-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: Ic6a8e74d22789832692e67a2b483db4d7ad09a8c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iff27b25d4377d2403112cab7bdf245c549e5e983 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I397e03395ffcbd855eafcdcc8dd19f2576c31f2c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia7ec05a75415c001e589b56935b24d234f9e9eb1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-011-0/+20
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I7592dd0c21288fc41d15ed7fd18b34c541c8bcac
| * | | 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.15.14.1Antti Kokko2020-01-091-0/+20
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | + ee9d746eb967a8b561b58ea51da027328f1f3d8a Bump version Change-Id: I4b56f86d3aaad3db84d3f7e4fdd6f89d46dfff67 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie07d30cd11f3bac5d18446c445b1c97146e5e911 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id6eb7f57db6fa5a723ceb5525d7d8340d9fc9992 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9e944e63ec62b3edf9fc4afd320478c242bce02a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-01-291-4/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0d0ee5a3e7853d6a5f531adf08d94dfdf44807e7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-01-291-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic1b0fe63bed456a342f881a0cf01ded8bac5ba03 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Iacca1cdfbf91d2be5d4443601858ffef9d48d3fe Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I1803ef27f47102a3ed381d8ade2d34349e5d2e9a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2020-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: If15c4523200e980ae4ed6d9f76bceefac88c3958 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-310-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I2980f90782add067aa08dddda3969eff4edc2aca
| * | | 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.15' into devQt Forward Merge Bot2019-12-171-0/+18
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ib3a26baa6f3f77a93eac2a33b2bc7f954562a023
| * | | 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.05.14.0Antti Kokko2019-11-281-0/+18
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I61dec28eeaba2674917a51255fd2449b77a13c88 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie0813d55e8bcc1a08f86369a5a9264cf5f3e9a58 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia9c4f5ab8af6d20ab3011f7004252576c82770ff Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-291-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I139f32d5c5504c8c4e4da9c060215ff73fe85209 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-281-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I9b721835711ed5880de3a608fde1a8d98afafcbf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-261-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I3271827ace586c356c278a518243fa70f2e47aa9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4f103df22ed6de787129aec8f14efa9218817d57 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-221-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia8f47303e560cf6e987de3995bc764536ac44e08 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I7fe229e19ee9f5ed775462371f41ea18ec394b56 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I36b3283124e988c2e64744a25ae6fbaf489867ee Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-121-0/+20
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I12bea2995358c5c052da0d25374f9ff35d1bbf64
| * | | 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
| | | * \ Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-302-1/+21
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: I65f756235421e7ed4a7a80b960c60d8bb170dd68
| | | | * | Add changes file for Qt 5.13.2v5.13.25.13.2Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 718d2ec554185f91db8e57e6ece14c7cf1b4caef Doc: add caveat about high spread values in Glow + de964f46df3ed7af9383bf59cee728be56216aaa Add changes file for Qt 5.12.5 Change-Id: If6dabcd91f6ae42c8be1d1832ecb3439dc4a2a73 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | | * | Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c8045a2c5422b1e80911af5ba134038c501d2fc
* | | | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2d6ab5707422ebe8b0175c8d55fba92065560b3a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I588190e474b13556ffe55eb35d4ac07ea1a5444c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-058-15/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: If155dc1c43a85bbf19428e9eb2a6c045e26e0519
| * | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-028-15/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: Iabee1fbfb826fbc28fc90baa44394466dc10aeef
| | * | | | Update plugins.qmltypes for Qt 5.14Kai Koehne2019-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc785ed86236fad0e8af8426003a1362c5ae7eae Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-267-14/+7
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | Change-Id: I3cbef8f35d67f99d41ceb35b6ee67094dd8a8b4f
| | | * | | Fix interpolation of effectsMitch Curtis2019-10-247-14/+7
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f02d6fc made relevant effects respect the smooth property of the layer, but made a few mistakes in the interpolation binding: - It got the order of the ternary operator branches wrong: Nearest was used when smooth was true, when it should have been Linear. - It uses the smooth property of the layer, which is automatically set by QGfxSourceProxy::updatePolish() as a result of setting its interpolation. - It also used the smooth property of the rootItem, which is the overlay itself, and not the source item. It would make more sense to base it on the smooth property of the source item, since all Item-derived types have this. Somehow (and luckily) this didn't result in any visible issues. Task-number: QTBUG-67382 Change-Id: I264579505b4195f5d19e1869e7e579d75bf97d5d Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8edf7a788efe4944d13f12f864cc6ac313686f5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtgraphicaleffectsQt Submodule Update Bot2019-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8c2c793782fdbdc1a5ff089b8301ad5ceb81c42 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>