summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.15.7.1Liang Qi2016-08-015-4/+8
|\ | | | | | | Change-Id: Ia90dc78a2c9340095d4dd0c050c1e20a895a3763
| * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"v5.6.25.6.2Sze Howe Koh2016-06-194-4/+4
| | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I5a42cd340599e118666e1430f5297f647bf9f90a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Update code snippet to match the image correctlyAndy Shaw2016-06-011-0/+4
| | | | | | | | | | Change-Id: Ibf66243d0a2d21fbc08e8d5d64c692f85f0caab1 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | Change-Id: I38b54781573f63f68e64f3837fbfa8f0e1721edd
* | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-0/+37
|\ \ | | | | | | | | | Change-Id: Ia48c6ea50257456abc0eefb10385074ca6fb3ea7
| * | Mention license change in 5.7.0 changelog.v5.7.05.7.0Kai Koehne2016-06-081-2/+18
| | | | | | | | | | | | | | | | | | | | | Change-Id: I1f72d9df336a5619be14486f22e40c9260049939 Task-number: QTBUG-53913 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Initial version of the QtGraphicalEffects Qt5.7.0 changelogv5.7.0-rc1Antti Kokko2016-05-241-0/+21
| | | | | | | | | | | | | | | Change-Id: I6af06f712843388fd188dc14c042b499e8ed4932 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Provide the ability to invert alpha in sourceMasks of OpacityMask.Jake Petroules2016-05-241-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | This is very useful for using masks exported directly from design tools like Photoshop which may utilize alpha in the inverse manner of Qt. Change-Id: I5e6358714b176cd3fe3cb22db380f313663aa0f7 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Use the pre-defined QQmlExtensionInterface_iid macroJ-P Nurmi2016-05-211-1/+1
|/ / | | | | | | | | | | | | | | | | The others were changed in 5.6 commit d01a936. This is the last remaining occurrence in 5.7. Task-number: QTBUG-53208 Change-Id: I9d8d3f8a4af590fd1b4d4883ae559119cda3d7d0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-194-9/+9
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I825ad0d8871ad068d33fe0f3ee3dfdee7679222a
| * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | Change-Id: If6935c7c341fc91f6ad9aaf3f9541236f6b115be
| * Fix QQmlExtensionInterface usagev5.6.1-1v5.6.15.6.1J-P Nurmi2016-05-102-2/+2
| | | | | | | | | | | | | | | | | | The version was first removed, and then restored, so it's now missing the version number. Use the pre-defined macro instead. Task-number: QTBUG-53208 Change-Id: Ibb4a727cedcdfc210bb62f6f826306d81893b816 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * make use of COPIESOswald Buddenhagen2016-04-281-5/+3
| | | | | | | | | | Change-Id: Iddab238e01a48cf2ce915e9f848cb3102d1bc046 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Make graphical effects' 'QML Types' link easier to spotMitch Curtis2016-04-271-2/+4
| | | | | | | | | | | | Task-number: QTBUG-52982 Change-Id: Ic20fac14c2007c6e0eba34b9fdd02886cd8f4090 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0835-0/+2
|\ \ | |/ | | | | Change-Id: Iafd3a05a5a2a47252f5ee0724ec0362f8b841124
| * Purge sRGB chunks from PNGs in tests.Edward Welbourne2016-03-234-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I21879d6d43c610ebee074bd12417d9d5ebc69096 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-2230-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: Ie8d9a72fde6bf65a63b8786fe2bb1a7c5da1c4b7 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-171-0/+2
| |\ | | | | | | | | | Change-Id: I0014d3d7a0f7b8039021242033a4a7e3cb9dcb94
| | * Fix crash when a ShaderEffectSource is missing a sourceItemv5.6.05.6.0Gunnar Sletta2016-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-51375 Change-Id: I98029d5a617c730a18897bebae27cf14c1d7b876 Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-071-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: Ia45746813799ea967fe8f601d2599646c688e13e
| * | Make ShaderEffectSource work with SourceProxy when sourceRect is unset.Gunnar Sletta2016-03-041-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-51519 Change-Id: I1250a2faf6b970fc60bd383294edd4fa44819856 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-154-18/+60
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia67a352bb51848428f8b907629c70ed340b57d78
| * | Bump versionOswald Buddenhagen2016-02-081-1/+1
| |/ | | | | | | Change-Id: I014db603d85edaaeeec16ca638799638aef9d624
| * Make Item::layer::effect: Effect {} work againv5.6.0-rc1Gunnar Sletta2016-01-112-11/+26
| | | | | | | | | | | | Task-number: QTBUG-49979 Change-Id: I7745b313194570b7ca0d086d41894a6d71f7610a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Fix SourceProxy's method for determining when to activate.v5.6.0-beta1Gunnar Sletta2015-12-083-17/+44
| | | | | | | | | | | | | | | | | | | | The logic had several flaws, including not respecting sourceRect and wanted interpolation, so do it over. Change-Id: I40b147a0e18ef5f9f3a0086904f9e9f93463c7fc Task-number: QTBUG-47749 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-2012-187/+836
| | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I958a4fa8bb2ed83873045dac405d02659fc4f71a Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-209-79/+1293
| | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I31f73910288778e417c59c306c398eb2358b6301 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Enable using the module in a statically built applicationAndy Shaw2015-12-215-5/+84
| | | | | | | | | | | | | | | | | | | | In order to make this possible the qml files need to be pulled into a plugin when statically built so a plugin is set up for the effects directory. This will effectively just be a stub in the dynamically built case. Change-Id: I421aa4972fe1923f10317515ee6c1df0fd69edda Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-031-3/+3
|\ \ | |/ | | | | Change-Id: I4979880863035841c54b771a35f5a22efad335aa
| * Update tests results of QColor <=> QString conversion code updateJędrzej Nowacki2015-12-031-3/+3
| | | | | | | | | | | | | | The tests was depending on a buggy behavior (QTBUG-37851) Change-Id: I238ff02a3ac4cdb4690b5233603f7cb4db3ef422 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-217-26/+79
|\ \ | |/ | | | | Change-Id: I83d4e298518a902e078174f9ab45835711252623
| * Use fallback blur shader for radius * 2 + 1 != sampleCount.Gunnar Sletta2015-11-053-16/+14
| | | | | | | | | | | | | | | | The faster code path looks a lot worse in this case, so fall back to use the generic arbitrary large blur size for this case. Change-Id: I3984b3bf48732a83dd112b7beb0fb4c3f8d38568 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Move QtGraphicalEffectsPlugin classname declaration to private qmldirMitch Curtis2015-11-032-1/+1
| | | | | | | | | | | | | | | | | | | | The public plugin is QML-only, and static builds of Qt require this information to be present in order to resolve module imports. Change-Id: I3ae6b92ab57df594e2778b4f19635bd353271acb Task-number: QTBUG-48830 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Clamp DropShadow's radius to [0, floor(samples/2)]Gunnar Sletta2015-10-191-1/+1
| | | | | | | | | | | | Change-Id: Ib92b7adf0c46aa6456797ba69c42f38fc67021bf Task-number: QTBUG-47749 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * changes file for 5.6Gunnar Sletta2015-10-191-0/+55
| | | | | | | | | | Change-Id: I0cb28d78fecf027d19eca859a2e2b51f2fd9fb07 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Make DropShadow properties into 'real' again.Gunnar Sletta2015-10-192-9/+5
| | | | | | | | | | | | Change-Id: Icf416b5db2cf9dbb0be29fc0e3b9a855c58035e3 Task-number: QTBUG-48625 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Ensure GL_MAX_VARYING_VECTORS is definedSamuel Gaist2015-10-191-0/+4
| | | | | | | | | | Change-Id: I8791c5879a5dc988249805d8e97b3a268e834380 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Correct value of GL_MAX_VARYING_FLOATSSamuel Gaist2015-10-191-1/+1
| | | | | | | | | | | | | | | | The constant value used for GL_MAX_VARYING_FLOATS is the value of GL_MAX_VARYING_VECTORS. Change-Id: I80c3bd8be34503bcc31cc040435248834fd811a1 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-1461-32/+779
|\ \ | |/ | | | | Change-Id: I1c7ea924a0393732e3c566d54d3a297b055dc9fe
| * Test type of double propertiesMitch Curtis2015-10-091-4/+55
| | | | | | | | | | | | | | | | | | | | This allows us to sanity-check future changes. The newly added checks are expected to fail until QTBUG-48625 is fixed. Change-Id: I9d505ee83ce774a13334c9d2e3c03baea0862237 Task-number: QTBUG-48625 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * add requires() on quickOswald Buddenhagen2015-09-291-0/+2
| | | | | | | | | | | | | | | | | | | | quick may be missing even though declarative is built, as it has a conditional on opengl being enabled. consequently, we can't rely on the repo dependency in the top-level repo. Task-number: QTBUG-48498 Change-Id: Ie0e54b991fc5e875a2a51f7a36e95855f726c0c9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Purge spurious execute permissions.Edward Welbourne2015-09-2945-0/+0
| | | | | | | | | | | | | | | | Running graphics and QML files would just be asking for trouble. Change-Id: I36ae4d060d1794f572230b04d1b1d4de30ed80e8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| * Doc: minor link issuesNico Vertriest2015-09-0910-21/+21
| | | | | | | | | | | | | | Change-Id: I61c44a8b5e8f72886e46d55f638b9fa392aaeec7 Task-number: QTBUG-43810 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| * restore previous context in QGfxShaderBuilderJoerg Bornemann2015-09-071-1/+7
| | | | | | | | | | | | | | | | | | | | QGfxShaderBuilder can be called while we're in the process of rendering a window. We must restore the previous OpenGL context instead of making a null context current. Change-Id: I6d1158bbcee781a7850d5fc7bea9e7070d62c0f6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6v5.6.0-alpha1Liang Qi2015-08-282-0/+688
| |\
| | * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-212-0/+688
| | |\ | | | | | | | | | | | | Change-Id: I64fdd5f0c14e0f07aa499aad5a3fea50d0b83ab4
| | | * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.15.5Liang Qi2015-08-190-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1d337a7aa19c3134ad784c726fc1055c06b3a3d2
| | | | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I84d9e57d5f993d8641613c9ccc4c24860f07ff8f
| | | * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * | | | Rename uniform step->dirstep to avoid conflicts with built-inGunnar Sletta2015-08-282-6/+6
| |/ / / | | | | | | | | | | | | | | | | Change-Id: Ifcffcaf3d057162bb6eb8af9cd3c2277bc5bf206 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
View Lorry Controller Status