summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | Change-Id: I9f5b49ca12e4c408471e938b7faba9dd586075f8
* 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>
* | 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>
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: I487aa113b27d3b6dcec351f664b73a2e6f31d4a4
* 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.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>
* Add .gitignoreMitch Curtis2018-04-171-0/+84
| | | | | Change-Id: I9740588b3ce0ab7841ac6a9c6920398869682ae3 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* 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>
* | | 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
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-121-0/+28
| | | | | | | | | | | | | | | Change-Id: I261741921313caa1d959dfeeb0d30b820151cbd6 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-309-9/+57
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/effects/private/qgfxshaderbuilder_p.h Change-Id: I27fbd2a8d7bf5bd89d94925a2da9ae3aa0748f42
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: I2594843ce024945744f53f9fb017e0ac1a6f684e
| | * Add changes file for Qt 5.9.2v5.9.25.9.2Antti Kokko2017-09-261-0/+25
| | | | | | | | | | | | | | | Change-Id: I2f7862c5edabd400482a5fdbb82d85c30b08aae6 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Add plugins.qmltypesMarco Benelli2017-09-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Even if there are no public components defined in C++, adding the `plugins.qmltypes` will prevent QtCreator to try to dump the module. Task-number: QTCREATORBUG-18952 Change-Id: I632342a05579957e123bbaa8bcfb3bbaec29232e Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * Doc: "strenght" => "strength"Mitch Curtis2017-09-204-7/+7
| | | | | | | | | | | | | | | Change-Id: Idbb66dc94eec5cfacf3a52c35059b7d54a424fe2 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| | * Remove extra character in documentationJesus Fernandez2017-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes the string: Note: This effect is available when running with OpenGL. s Change-Id: I82fb3f12f3d64832d7e201bc41c1f64c3ac6bc2a Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| | * Ensure m_maxBlurSamples is initialized to 0Svenn-Arne Dragly2017-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Valgrind reports a conditional jump that depends on this uninitialized value in gaussianBlur(). Change-Id: I19fc143e8adf5264df514b930af048ee6d810538 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Add change file for Qt 5.6.3Liang Qi2017-09-051-0/+12
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62719 Change-Id: I78a26008cdce90d44ba2d55bc707d5fffbc4a7b0 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-1/+1
| | | | | | | | | | | | | | | Change-Id: I9b84ee88a024926e42a419a6574ff63708c6edae Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Bump versionFrederik Gladhorn2017-09-041-1/+1
|/ / | | | | | | Change-Id: I1bfd0934d95941f3cfe14b5ac00a628c452dff5d
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Liang Qi2017-08-152-1/+25
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7be62c2165ffc5a4bcecfb2cd291f13b1f1c609f
| * Add dependency on QtQuick.Window in the qmldir to aid static buildsAndy Shaw2017-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | Since GaussianBlur depends on QtQuick.Window it needs to be added as a dependency in the qmldir. This ensures that qmlimportscanner will add the reference to the Window type in the output too. Task-number: QTBUG-57205 Change-Id: Ibcd52df78df23dc6d39ded38a8a2ceee4a9d2050 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: I676046a629da2e338a72108a5d440e276db8b1a3
| * Add changes file for 5.9.1v5.9.15.9.1Antti Kokko2017-06-231-0/+24
| | | | | | | | | | Change-Id: I0250d017e644dabd7b0bce72456b02b9d9690722 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Support OpenGL core profileJoni Poikelin2017-06-08116-883/+1704
| | | | | | | | | | | | | | | | | | [ChangeLog][Qt Graphical Effects] Added QtGraphicalEffects support for OpenGL Core profile contexts. Task-number: QTBUG-42107 Change-Id: I7111e2e6fb3a0b0391e76a17a8d091d288bfcc23 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-07127-4839/+2556
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iebba2a2ff4df2aedcb63c7171417d5b3769e9ac6
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+22
| |\ | | | | | | | | | Change-Id: Ibd78e360baaddff9faaab093d919c6fecac753d0
| | * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Antti Kokko2017-05-151-0/+22
| | | | | | | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I66b493f90831e392c7e468efcbcf6a205e9f0feb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>