summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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>
* 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: I02fbbdbd16fcbf0106f15f3e0b689e0473e58773
| * 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: Id81c92b93d3aad149662ae053844fcdea5a29d59
| | * Merge "Add changes file for Qt 5.12.5"v5.12.55.12.5Antti Kokko2019-08-231-0/+20
| | |\ | |/ /
| | * Add changes file for Qt 5.12.5Antti Kokko2019-08-231-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | + c8ba132f6ca78f63440f21e9a18f9e90f62377f1 Bump version + f9664053132affe48a069235eb6561a32d38b2a7 Account for the device pixel ratio when showing a DropShadow Change-Id: If93da2edee22e35452cebe1edd65cb40c5649081 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| |\ \ \ |/ / / / | | | | | | | | Change-Id: I2ac2b8c0afb821a9748563ff0f9335aa37ebeba7
| * | | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-07-311-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 9144bf66a15520c30b3ecbb12c7482df40fc699a Bump version + 7b92bc10c5bb7b5c87421198895eae632d10702b Add changes file for Qt 5.12.4 + fe48c1884cd8e1c4194c3242b482a7b9eb509520 Bump version + c8ba132f6ca78f63440f21e9a18f9e90f62377f1 Bump version + f9664053132affe48a069235eb6561a32d38b2a7 Account for the device pixel ratio when showing a DropShadow + 48f4de2d3bda3b0b0486b5c639cf196ee2fc26b7 Doc: Replace example file lists with links to code.qt.io Change-Id: I73f3aacba5a951f73f437139871141098eb4594a Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-241-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-241-0/+4
| |\ \ \ |/ / / / | | _ / | | / Change-Id: Id486a01e0d73f138fc7e18ede2f2bfbba7b9ddfd
| * | Doc: add caveat about high spread values in GlowEirik Aavitsland2019-08-211-0/+4
| |/ | | | | | | | | | | Task-number: QTBUG-74834 Change-Id: I4940bb5ace7ef7a36428ef4e3ff72b81f5391575 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-111-2/+3
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-111-2/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I82a19a2f5dfb90945d5ce9ecc61c81c9a6fde3a3
| | * Account for the device pixel ratio when showing a DropShadowAndy Shaw2019-07-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The radius and samples needs to be multiplied by the device pixel ratio so that it looks as it would if it was on a non HighDpi screen. So the size of the shadow still looks the same size and as good. Change-Id: Ifa87ec6fad5cdded1a7b1888b2e8c74bcc3f0b54 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: Ie82e64a2304ab61eb5c712b2397f172932bdc2a2
* | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
|/ / | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Id8ebd8b70759da5e7187cfdc71191435462328ca Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: Ie7362d007191f04d9a5af51bd1d1f9cb16fb425f
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| |\ \ |/ / / | | _ | | | | | | | | Conflicts: .qmake.conf Change-Id: I7302533c59941045b0397672a45af94e979a7abd
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | |\ | |/ / | | | | | | Change-Id: I536cd4c82203357e0340d420ac5058298a2f3a2c
| | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | Change-Id: If95406fc29f32bcfbe14a3922752f80d211ed4ce Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| |/ | | | | | | Change-Id: I1c5b64ff501118c2db9d31df40e0e21860a2776f
* | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
|\ \
| * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| |\ \ |/ / / | | | | | | Change-Id: I88a113861dcd61ef7f00f29fe1368e85956e871f
| * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-081-0/+18
|/ / | | | | | | | | Change-Id: I6847ef4b8d78e40b4fc76dd81eed2a792090f0ec Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
|\ \ | |/ | | | | Change-Id: Ia95415f107705229bea83f542918df0ba54b9112
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| |\ | | | | | | | | | Change-Id: I3d117906d532686c861e5c1ca07edb19d54d7c76
| | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-021-0/+20
| |/ | | | | | | | | | | | | | | | | + 23a9a04935c28110c2cff0d71873573d8f8f51c3 Android: Fix autotest + 53d133c517d8bec7e79d95cbd326cbc022d3b8c9 Bump version + e7ab193d855806d7333577ad7d9d15165d1b5cf8 Doc: Fix snippet to use latest version for QML import Change-Id: I63eab3c27963fe3ad04d5b2142ddc92bfc2f99f2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Doc: Fix documentation issuesv5.13.0-beta3v5.13.0-beta2Topi Reinio2019-03-272-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | RadialGradient.qml tried to document two properties with a single comment block - QDoc supports this, but only if you specify the properties with multiple \qmlproperty commands. Also clear the moduleheader .qdocconf variable, as this module has no C++ API. Change-Id: Ic69ba94f6031c77d249c0b4278cff7f35344fcf9 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-271-3/+3
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie477dc9e9d78eb81ba54a44ac7d1621282bf5f28
| * Doc: Fix snippet to use latest version for QML importKai Koehne2019-03-221-3/+3
| | | | | | | | | | Change-Id: I8098a28d82bd2f6b6ff722441c7ca6dcd4551cc2 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: Ic79c309400a6984e9c08cf34ccc36888c81fa7fc
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-212-3/+3
| | | | | | | | | | | | Task-number: QTBUG-73484 Change-Id: I6a09bd2dfd67d2d36fa8054cefbac5a86db8e3d4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
|\ \ | |/ | | | | Change-Id: I4d4c6c7c90f3c698f490973562ceaa2467ff2d18
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| |\ | | | | | | | | | Change-Id: I5eaa92286c969d0c9a37251b2b6853cf30780af7
| | * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-211-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | + 64c479e151557343a1ffc684e2ba76c9ef97b1f9 Bump version + 56a4a58c999e03385bad6ab052f87ffe2c63500f Fix GammaAdjust shader path Change-Id: I77390d63564c50d20396ad285b267d488fc1d852 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-03-053-1/+14
|\ \ \ | |/ / | | | | | | Change-Id: I22dc781c5a97a5918318109e7047f80d9ab2e075
| * | Android: Fix autotestEskil Abrahamsen Blomfeldt2019-03-043-1/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, we need to include a dummy.qml which imports the graphical effects, otherwise it will be ignored by qmlimportscanner, since all the QML code is generated programmatically. Second of all, using the Qml2ImportPath to look up the imports is not sufficient on Android, where the QML2_IMPORT_PATH environment variable is used instead. So we just add code to check this first, based on the order of precedence actually used by Qt. Task-number: QTBUG-73574 Change-Id: I7b140dcac758ff37340fd7539f5cacb2982ff7aa Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-1/+1
|\ \ | |/ | | | | Change-Id: Icb4e57901a362f97f2ac8561057ec56ce0b21103
| * Fix GammaAdjust shader pathJoni Poikelin2019-01-221-1/+1
| | | | | | | | | | Change-Id: I481085825fd05c43c9a4710d7a6c58c619737cf1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I14fd028c3d790fc6bb843d645441dfe31a1ded94
| * Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | Change-Id: I97523bfdf9f5cdd245732c1aae47942c38d3d9fa
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-09115-207/+288
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I73721d9841e91777638474816da4e387c7c9db59
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-01-093-2/+24
| |\ | | | | | | | | | Change-Id: Ib7e7fc1cbe344cd4fe66a3a2be0d591c22509b47
View Lorry Controller Status