summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-0/+24
|\ \ | |/ | | | | Change-Id: I4b72f14860d98545e4b79196330bdca1bf7416d2
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: I795dec77c59bc8f10cf2f42d0d561cb4ce02ca12
| | * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-131-0/+24
| | | | | | | | | | | | | | | Change-Id: I468b949fb1ab2ae75a939eda94a89d8ba4b47a17 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-163-1/+54
|\ \ \ | |/ / | | | | | | Change-Id: Id2762b6e8b03f0e7ae990dad288100f8f4cbb67e
| * | Add changes file for Qt 5.9.6Antti Kokko2018-06-141-0/+24
| | | | | | | | | | | | | | | | | | Change-Id: Ieb971878eef336e5a69bdae4743acad7f4741fc8 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit f61dcaa5e5ef8f5da1b37b25e4bd17469e72ce55)
| * | Add changes file for Qt 5.9.5Antti Kokko2018-06-141-0/+24
| | | | | | | | | | | | | | | | | | Change-Id: Ic00cded42767f13aa9ae07e832fc721d7adb1571 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 3d317f1bb018e6c519a54f428dc4c5309a24dfad)
| * | Do not try to create a surface if context creation failsAndras Mantia2018-06-141-1/+6
| |/ | | | | | | | | | | | | | | | | | | If context creation fails and we try to create a surface, this might end up creating a new window that steals the focus from the existing one. This was visible with a full-screen embedded application using the software renderer and a QML code using "layer.enabled: true" Change-Id: If72255a8447d88198249c2d6571aea27d8549b9b Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-050-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2a62f05dc1162342ea7bd725d9ef2c5ed3fb31d6
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: I487aa113b27d3b6dcec351f664b73a2e6f31d4a4
* | Make relevant effects respect layer.smoothMitch Curtis2018-05-2915-1/+481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, source items that set smooth to false will have blurry effects when using layer.effect. Fix that by setting the interpolation property of each effect's SourceProxy. Standalone effects seem to work fine already. The patch adds a manual testcase: "smooth". This can be used to verify that the functionality works in the future, as adding an auto test is not really possible. This isn't done for all effects, as it doesn't make sense for all of them (blurs, for example). Task-number: QTBUG-67382 Change-Id: Ic6f030090cd0579dd4259ebafc9c99a8b9940494 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | testbed: increase window heightMitch Curtis2018-05-291-1/+1
| | | | | | | | | | | | | | | | Makes it possible to see all effects instantly without having to resize the window manually. Change-Id: I72497be73979b410ac57b3a089715237e98d5017 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-291-100/+51
|\ \ | |/ | | | | Change-Id: I5adf9753e4b78409216f1fb3588f6ad2554c030a
| * tst_graphicaleffects: use QScopedPointerMitch Curtis2018-05-281-100/+51
| | | | | | | | | | | | | | Otherwise failed QVERIFYs, etc. will result in leaked memory. Change-Id: I0a48f62a28ebaa04a856a4b772f5ff98def4f171 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\ \ | |/ | | | | Change-Id: Ibbd9bd5047dc17232d15bca2fd89fe8eb2df92dd
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: Iebe39507ad957dbb65a626b093eaa61a79b25295
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-201-0/+22
| |/ | | | | | | | | Change-Id: I1d8c84d9a3011a43199aeb94518caeaf76a36669 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-262-17/+2
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I008dcbc44f3722184fb4cdf7c231c6a9c18cc86d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-211-0/+84
|\ \ | |/ | | | | Change-Id: I0bf1fc1d605e34c6a002556199ba5bb38118a6b7
| * Add .gitignoreMitch Curtis2018-04-171-0/+84
| | | | | | | | | | Change-Id: I9740588b3ce0ab7841ac6a9c6920398869682ae3 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-275-4/+30
|\ \ | |/ | | | | Change-Id: If4494516bfca9f3b25526e44302186d94c6e6c85
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta4v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8117f5f5982fdf7954d0510fcad10adc6e00bd20
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: If21ecb61f91559a5cc2291468051e3984231e1d6
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
| |\ \ | | | | | | | | | | | | Change-Id: I31e54722b5786811c1fd58cd30234b298bcca462
| | * | Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia7f7361c85e99999fb13840f4c469240171bedb8 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | | Fix typosJarek Kobus2018-02-144-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I333a33a65ce4ff2469f7eb66663808cb75d756a2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: I009347f50081fc69339f4f1c4219989adbedad83
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-203-0/+50
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I56e694eec6b9196e1e5db256569b95cf580d5735
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-181-0/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I77989277bff5d59235f4195a95637bdab5325fed
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: Icbb21719f7c66e7da71bf0060e30b82571580005
| | | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-081-0/+25
| | |/ | | | | | | | | | | | | Change-Id: Id80e7ce74eba90326d9fb66bea5b9be77b5f51e5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I7580d61dce71d97e0fc6d77455a616f9d62019d8
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I17eadebb184fcf2c82e7185328d6e2d92bb5afbb
| * | | Fix static buildsJoni Poikelin2018-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64775 Change-Id: I93418fc835723b90f8d2b2d212021eb8753e6508 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I1b0f8447802a1a16c1c76d3d387e083afc79a195
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: If96e98bbe34dd6bb450e2fdb552f1155250da5e0
| | * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-211-0/+24
| | |\ \ \ | |/ / / / | | | | _ | | | | Change-Id: Id3eb4dda3d8b431e68a9966012aaa95ae484cce2
| | * | Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-101-0/+24
| | |/ | | | | | | | | | | | | Change-Id: I617d25c526b7bba46fd7be733233d4dacd75f605 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | Revert "Skip tst_qtgraphicaleffects::innerShadow on qemu"Sami Nurmenniemi2018-01-082-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 247f19f08adfa287e9c5493ce8ffc2e3db260956. QtDeclarative was fixed with 781caafe1fde71b059c0e3a42bda77ce0d7e4c2a and tests pass now. Task-number: QTBUG-65521 Change-Id: I43b2cd4be334248f35bbcf1403e668cb21129421 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Skip tst_qtgraphicaleffects::innerShadow on qemuSami Nurmenniemi2017-12-152-0/+9
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-65204 Change-Id: I4fa090f6557f893e5bada9a73896aba47d9e7959 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2010-9/+85
|\ \ \ | |/ / | | | | | | Change-Id: Ie491ceab6e3c3111b87c03490dd36deb601f045f
View Lorry Controller Status