aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix GammaAdjust shader pathJoni Poikelin2019-01-221-1/+1
| | | | | Change-Id: I481085825fd05c43c9a4710d7a6c58c619737cf1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Support the import of from 1.0 to 1.QT_VERSION_MINOR-1v5.12.1Liang Qi2019-01-091-0/+2
| | | | | | Task-number: QTBUG-72270 Change-Id: Id13708b1f4ef5c890037dac8b6225c3e096d88b0 Reviewed-by: Ulf Hermann <ulf.hermann@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 5.12 into 5.12.0Oswald Buddenhagen2018-10-3035-70/+77
|\ | | | | | | 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-2335-69/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 devQt Forward Merge Bot2018-06-161-1/+6
|\ | | | | | | Change-Id: Id2762b6e8b03f0e7ae990dad288100f8f4cbb67e
| * 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>
* | Make relevant effects respect layer.smoothMitch Curtis2018-05-297-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 18:46:42 +0000