aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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-201-0/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I56e694eec6b9196e1e5db256569b95cf580d5735
| * 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>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-207-9/+20
|\| | | | | | | Change-Id: Ie491ceab6e3c3111b87c03490dd36deb601f045f
| * Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-307-9/+20
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/effects/private/qgfxshaderbuilder_p.h Change-Id: I27fbd2a8d7bf5bd89d94925a2da9ae3aa0748f42
| | * 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>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-1/+1
|/ / | | | | | | | | Change-Id: I9b84ee88a024926e42a419a6574ff63708c6edae Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Liang Qi2017-08-151-1/+1
|\| | | | | | | | | | | | | 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>
* | Support OpenGL core profileJoni Poikelin2017-06-0891-858/+1679
|/ | | | | | | | | [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>
* Fix licensingJani Heikkinen2017-05-1062-1719/+1659
| | | | | | | | | | | | | - Remove unused old license files - Unify licensing * Tools and tests are nowdays licensed under GPL-EXCEPT, update correct license header to those * Src is nowdays licensed under LGPL, update correct license header to there Task-number: QTBUG-57147 Change-Id: I9664c854108ca7c1e0be02fdae9e8d7c480dfd4c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Enable the use of QML cache creation at build timev5.9.0-beta4v5.9.0-beta3v5.9.0-beta2Simon Hausmann2017-04-062-0/+4
| | | | | | | Task-number: QTBUG-58571 Change-Id: I5b38feb059f7c931f170b9410ca7a2759f6d3ef3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devv5.8.0-beta1v5.8.0-alpha1Liang Qi2016-08-021-0/+4
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7b89f06f0c3cc389a79c177e50685bb53157e0a1
| * Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-08-011-0/+4
| |\ | | | | | | | | | Change-Id: Ia90dc78a2c9340095d4dd0c050c1e20a895a3763
| | * Update code snippet to match the image correctlyAndy Shaw2016-06-011-0/+4
| | | | | | | | | | | | | | | Change-Id: Ibf66243d0a2d21fbc08e8d5d64c692f85f0caab1 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Document that the effects need OpenGLLaszlo Agocs2016-06-2426-0/+58
|/ / | | | | | | | | Change-Id: Ie42ce93850475c036b2bb4e1fa9068c597317c48 Reviewed-by: Andy Nichols <andy.nichols@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-192-3/+5
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I825ad0d8871ad068d33fe0f3ee3dfdee7679222a
| * Fix QQmlExtensionInterface usagev5.6.1-1v5.6.1J-P Nurmi2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | 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 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-0831-0/+2
|\| | | | | | | Change-Id: Iafd3a05a5a2a47252f5ee0724ec0362f8b841124
| * 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.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-152-14/+56
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia67a352bb51848428f8b907629c70ed340b57d78
| * 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-081-13/+40
| | | | | | | | | | | | | | | | | | | | 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-206-79/+115
| | | | | | | | | | | | | | | | | | | | 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>
* 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>
* Make DropShadow properties into 'real' again.Gunnar Sletta2015-10-191-5/+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>
* Purge spurious execute permissions.Edward Welbourne2015-09-2933-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>
* 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>
* Change the default DropShadow offset back to 0.Gunnar Sletta2015-08-171-2/+2
| | | | | | | | | | Though this makes DropShadows work out of the box and be less confusing to users, it also ends up breaking code that uses DropShadow as a glow effect. Change-Id: Id65dc85d2877709f3bd8d036f06c7b8fc2886777 Task-number: QTBUG-47749 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-093-67/+124
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iaee160172f27e36a8fa7c46a9f2154c6864d93de
| * Doc: rearrang tables with overflowNico Vertriest2015-07-153-67/+124
| | | | | | | | | | | | Task-number: QTBUG-46475 Change-Id: I6f3256255089e40180af72d73b4c1d86ca505292 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Fix warnings in gradients.Gunnar Sletta2015-06-301-1/+2
| | | | | | | | | | | | | | | | We're assigning 'undefined' to it, so implement a resetter. Change-Id: Ie43282043b250f2e9cd247d4819b1827ab7e9e97 Task-number: QTBUG-46774 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 12:25:39 +0000