summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.8v5.12.85.12.8Antti Kokko2020-03-241-0/+20
| | | | | | | + 276d024d5ae694a41837bb1eceae325bd41060ce Bump version Change-Id: Ibff727bb5e6d2b6015d1d4421a738d77aad7d365 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12.7' into 5.12Qt Forward Merge Bot2020-01-311-0/+20
|\ | | | | | | Change-Id: Ie481b0b57cf6d4ea424bcf56c26b2d216505b7b9
| * Add changes file for Qt 5.12.7v5.12.75.12.7Antti Kokko2020-01-171-0/+20
| | | | | | | | | | | | | | + 2b6f3e5e84df63169a5d4d41bad28b90ac601bf2 Bump version Change-Id: I4a24d6b995a73f1728802aab62cfacb441cdbdad Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Bump versionAlexandru Croitor2020-01-281-1/+1
|/
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-071-0/+20
|\ | | | | | | Change-Id: Ifc300c1279f52ce41240cee871b4d058ef6fc814
| * Add changes file for Qt 5.12.6v5.12.65.12.6Antti Kokko2019-11-051-0/+20
| | | | | | | | | | | | | | + 46573542c758f687e280cc3b695403551d8b1c1f Bump version Change-Id: I6d6f5d102b08a301fef001144b6fe8437a8ddcab Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Bump versionFrederik Gladhorn2019-11-071-1/+1
|/
* Bump versionFrederik Gladhorn2019-10-301-1/+1
|
* 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>
* | 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>
* 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
* 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 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 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
* 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>
* | 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>
* Fix GammaAdjust shader pathJoni Poikelin2019-01-221-1/+1
| | | | | Change-Id: I481085825fd05c43c9a4710d7a6c58c619737cf1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Bump versionKari Oikarinen2019-01-141-1/+1
| | | | Change-Id: I97523bfdf9f5cdd245732c1aae47942c38d3d9fa
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-01-093-2/+24
|\ | | | | | | Change-Id: Ib7e7fc1cbe344cd4fe66a3a2be0d591c22509b47
| * Support the import of from 1.0 to 1.QT_VERSION_MINOR-1v5.12.15.12.1Liang Qi2019-01-091-0/+2
| | | | | | | | | | | | Task-number: QTBUG-72270 Change-Id: Id13708b1f4ef5c890037dac8b6225c3e096d88b0 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * Add changes file for Qt 5.12.1Antti Kokko2019-01-091-0/+20
| | | | | | | | | | | | | | | | | | | | + 7e2544e28cac2fbf7176b6692dacc57096774249 Bump version + d560b79d050659715159d5f04b2e96fd38d0230c Add changes file for Qt 5.11.3 + 7aa3859508e7c78f8340d667b4a891b4c0c14303 Doc: Add the missing \QtMinorVersion argument + cdb0a5dddf84e27dda294cecebd64c282227f162 Bump version Change-Id: I0bc4374b3059181fdfbfc765e592ec7ccd424973 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-082-1/+21
| |\ | |/ |/| | | Change-Id: I5f614700143ab9e284134c3fb2a71ed47a1cd395
* | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I24622688ad10c81030b5f43173b27d07f3973a5e
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ \ | | | | | | | | | Change-Id: I3f6109835bc715ca90eadfdc2e206d65222485ee
| * \ Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: Iea79a845ca0ed190c064b2a3a7373e4e823526b4
| | * | Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-161-0/+20
| |/ / | | | | | | | | | | | | | | | | | | + 7e2544e28cac2fbf7176b6692dacc57096774249 Bump version Change-Id: I45b538243571dfd5060ff4804b3f5cc02d9f215a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Doc: Add the missing \QtMinorVersion argumentVenugopal Shivashankar2018-12-241-2/+2
| |/ |/| | | | | | | | | | | | | | | Without this argument to the \qml...\endqml block, \1 will not be translated to the Qt minor version. Change-Id: I73741639a060c532726044b098cececdf795ee78 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+27
|\ \ | | | | | | | | | Change-Id: I93257923f762ebd062c6a0429116d04048a6f119
| * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.05.12.0Antti Kokko2018-10-311-0/+27
| | | | | | | | | | | | | | | | | | Change-Id: I0f44816bbba9b7f260ee951d50c04251fa03b8f4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: .qmake.conf Change-Id: I2389865eb14c2e141a3e9f04e099743b5f3eeec7
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | Change-Id: I499ce215a0fb5fc5327b0ea49de143cf640d31a0
* | Merge 5.12 into 5.12.0Oswald Buddenhagen2018-10-3084-150/+160
|\ \ | | | | | | | | | Change-Id: I8a0e5853af30d185e426000561057210f432ac3d
| * | Doc: Fix \code command usageTopi Reinio2018-10-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 5.12, \code command accepts parameters, and in-line usage no longer works (and wasnever documented to work). Task-number: QTBUG-70980 Change-Id: I06e59b4a6fc91a5359d76cc6969a295384f52f94 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | add qmlRegisterModule to QML plugins (QUIP 99)Shawn Rutledge2018-10-2384-149/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it should always be possible to do import QtGraphicalEffects 1.m where m is Qt's minor version. [ChangeLog][Qt Graphical Effects] In Qt 5.12 and newer versions, this module is available with the same minor version as the Qt release minor version number. For example import QtGraphicalEffects 1.12 will work in Qt 5.12, even though there has been no API change, and the maximum possible import version will automatically increment in future Qt versions. This is intended to reduce confusion. Change-Id: I4fa13fa9a662933161ff726a3e2ba586b2f7f6ff Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Docs: import version 1.12 (QUIP-99)Shawn Rutledge2018-10-2928-56/+58
|/ / | | | | | | | | Change-Id: I514b09a90429c8e9c60f9c7b312d3197e2b23a41 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\ \ | |/ | | | | Change-Id: I9d5292b275ce2a672b1c9ea9853645b036395711
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: Ibda66ce911ecb28e45fb582fd0c4456b43b8e8d9
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: Ic7ec73012f2da14de6adfd7c65aa8de7b3ac4bcc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I823ab0ba7948ebdd8ad098f844ba72ad7897bbfa
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I9f5b49ca12e4c408471e938b7faba9dd586075f8
View Lorry Controller Status