summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-08-28Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6v5.5.90+alpha1upstreamLiang Qi2-0/+688
2015-08-28Rename uniform step->dirstep to avoid conflicts with built-inGunnar Sletta2-6/+6
Change-Id: Ifcffcaf3d057162bb6eb8af9cd3c2277bc5bf206 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-08-21Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2-0/+688
Change-Id: I64fdd5f0c14e0f07aa499aad5a3fea50d0b83ab4
2015-08-19Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi0-0/+0
Conflicts: .qmake.conf Change-Id: I1d337a7aa19c3134ad784c726fc1055c06b3a3d2
2015-08-17Change the default DropShadow offset back to 0.Gunnar Sletta2-4/+4
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>
2015-08-13Add the GPLv3 license textThiago Macieira2-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>
2015-08-09Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn3-67/+124
Conflicts: .qmake.conf Change-Id: Iaee160172f27e36a8fa7c46a9f2154c6864d93de
2015-07-15Doc: rearrang tables with overflowNico Vertriest3-67/+124
Task-number: QTBUG-46475 Change-Id: I6f3256255089e40180af72d73b4c1d86ca505292 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2015-06-30Fix warnings in gradients.Gunnar Sletta1-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>
2015-06-29Bump versionOswald Buddenhagen1-1/+1
Change-Id: I87ae8ef991682e812f9e3c09d5d28170a8d9e505
2015-04-20Bump versionOswald Buddenhagen1-1/+1
Change-Id: I84d9e57d5f993d8641613c9ccc4c24860f07ff8f
2015-03-24Adapt QtGraphicalEffects autotest to check for the new values.Gunnar Sletta1-15/+11
Change-Id: Iff577c9400cf2b3de9b97c8b898b4c971a2b9514 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-03-24Implement MaskedBlur in terms of the new GaussianBlur.Gunnar Sletta4-127/+86
The mask code uses the fallback shader which is equivalent, performance wise, to what we have in Qt 5.4, but in the interest of keeping one codebase for all the blurring, we'll replace it anyway. 'transparentBorder' doesn't do anything anymore because it never really worked to begin with and it doesn't make sense. See comment in code. 'fast' codepath has been removed because it isn't really all that fast. [ChangeLog] MaskedBlur has a new blur implementation. The default values of properties has been updated such that 'layer.effect: MaskedBlur { maskSource: myMask }' works out of the box. The 'fast' and 'transparentBorder' properties no longer have any effect. Change-Id: Ibc05442914b563c50c95212fb0d4578f02990504 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-03-24Implement Glow using the new gaussian blur.Gunnar Sletta5-122/+82
The fast code path has been removed, same rationale as in the 'DropShadow' case. [ChangeLog] Glow has a new and faster blur implementation. Its default values have been updated so that 'layer.effect: Glow { }' produces sensibe output and 'fast' no longer has any effect. Change-Id: I88aa16baf294851531f414ec52095d46561dbea8 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-03-24doc: fix linkageGunnar Sletta1-3/+3
Change-Id: I4cf539f61e372928d78116dca73ad2c9b5da66a7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-03-24Implement DropShadow using the new gaussian blur.Gunnar Sletta7-150/+184
The 'fast' path has been discarded because it fails to deliver on the fast promise. For radii less than 30-40 the normal blur is faster, so little point [ChangeLog] DropShadow uses the new gaussian blur implementation. 'fast' no longer has any effect. The default values have been updated so that 'layer.effect: DropShadow { }' works out of the box. Change-Id: I7e4ace4623613f0969a35e0c9bb873c18a158450 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-03-13Fix qdoc warnings in the new GaussianBlur implementation.Gunnar Sletta1-12/+18
Change-Id: Ia2e04f8d16fa90a56aad2eb65aa14eef34c7a3f0 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-03-13Adapt GaussianBlur autotest to the new default values.Gunnar Sletta1-4/+3
Change-Id: I27c405af55384b5ea9a5c823bfed9fb5e8ba2161 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-03-13Improve Gaussian Blur.Gunnar Sletta6-59/+547
The shader source generation has been moved to C++ and the following improvements have been made to the algorithm: - Rely on linear sampling to roughly halve the number of samples required to perform blurring, while still mathmatically accurate. - Avoid dependent texture reads by calculating the sample positions in the vertex shader. This only works if the vec2 is used in texture2D() directly from the varying without any arithmetic and no swizzle mask applied. The fragment shader can then in many cases prefetch the texture value. - Implement a fallback shader which is used when samples exceed the maximum number of varyings. The old implementation supported 32 samples. The new one switches to the fallback when the required samples / 2 exceeds the number of available varying registers on the GPU. The fallback shader is equivalent to the old code performance wise, but supports an arbitrary high number of samples. [ChangeLog] Gaussian Blur has a new implementation. Faster for smaller kernels, similar for larger kernels but allows arbitrarily large kernels. The fast version will support at least 15x15 kernels on OpenGL ES and 59x59 kernels on Desktop GL. GaussianBlur.deviation is now a very costly parameter to change. Change-Id: I1ac44633ec6b3b667ebfab2211fa53e706804787 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-03-10Let sourceproxy auto-configure layers.Gunnar Sletta2-14/+25
In the old SourceProxy implementation, layer.enabled = true that the layer was used without a shader source in between. However, since effects like Blur and DropShadow requires updates to sourceRect and such, the effects would not work properly. Since the usecase for layers is primarily to combine it with layer.effect, we configure the layer. [ChangeLog] When applying an effect to Item::layer.effect, the effect will update the layer properties to make the effect work, such as 'smooth' to 'true' and changing 'sourceRect' to take 'transparentBorder' into account. Change-Id: Idd68b025ade46c0b84142b2afb244730bed863d2 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-03-10Exclude images from the textureProvider branch.Gunnar Sletta1-1/+1
We already checked them just above, and since they are texture providers, they would falsely report true here leading to bugs.. Change-Id: I70e29f15333a00ca973c16f9f3396d216bc014df Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-03-10Move SourceProxy to C++ and introduce "private" module.Gunnar Sletta43-199/+766
This gives us a bit better control in terms of what we want to check for. It should also fix some subtle bugs when layer and ShaderEffectSource is used as input. Change-Id: I29de13598811623c31563ac6e88f070aee0bab54 Task-number: QTBUG-40849 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-02-24Bump versionOswald Buddenhagen1-1/+1
Change-Id: I014ff6de07dde25959e5590a36295d96cb7695cf
2015-02-17Update copyright headersAntti Kokko124-524/+524
Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I8983b05749d75b438a314e7f385a85c612a04f6f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-01-19Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn1-1/+1
Conflicts: .qmake.conf Change-Id: I4f99c72926a0d0ac0b79f89a0f8f4234685b0ac3
2015-01-16Bump versionOswald Buddenhagen1-1/+1
Change-Id: I6e556cc4c1ac27c93711124fad3b77e177916ea4
2015-01-05Fix typo in Desaturate documentation.v5.4.1Mitch Curtis1-1/+1
Change-Id: I048d6dbf54eff658b74f221af5faa1a517deb310 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-12-17Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn25-25/+25
Conflicts: .qmake.conf Change-Id: Ie64aa3089d47063e82f8d1cb77929deee86c62ea
2014-12-12Bump versionOswald Buddenhagen1-1/+1
Change-Id: I1c61bf871b41c725416b4f17ee258177d95fdd8d
2014-12-08Remove unnecessary \inqmlmodule parameterAlejandro Exojo25-25/+25
Change-Id: Ib685e533a97bae865df5802c4f9e7399c8cfd078 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-10-20Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2-3/+3
Change-Id: I56d3c01f3ceffc318085a3cef8bd6cfe152f141e
2014-10-10Doc: Applied title case in section1 titlesv5.4.0Nico Vertriest1-1/+1
Task-number: QTBUG-41250 Change-Id: Ic91b1db2bd27800a808cd4c997c1b606ea4bec10 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-10-10Correct grammar in DropShadow's detailed description.Mitch Curtis1-2/+2
Change-Id: If77e25a80ed139c0903b511062ff6dd615df2c70 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-10-09Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn7-0/+208
Change-Id: I259099e0d550e5a1f0d6846d6024876d06fa1b4c
2014-09-30Document DropShadow and Glow's transparentBorder properties.v5.3.99+beta1Mitch Curtis6-0/+207
Change-Id: I1f4be68c5b364e5d2151ed26b079a0f00ac31f0c Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
2014-09-21Adding designersupported to pluginsThomas Hartmann1-0/+1
This patch adds designersupported to the plugins supported by QtQuick Designer. Change-Id: I022bdeab6ef1e22dfffd7e1e95b292212aaf10eb Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-19Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn0-0/+0
Change-Id: I7289625e062c5ce4126c240b459057258793dd85
2014-09-16Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I7fd0ea8631fc0f5e9228781afe66b3dda9d73f59
2014-08-29Bump versionFrederik Gladhorn1-1/+1
Change-Id: I0668ef08ef66d837de74816b805b634e0c0d50e8
2014-08-28Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn15-893/+596
Change-Id: I9e864085ed329349aaa49551a15a8521d140aaa7
2014-08-24Update license headers and add new licensesJani Heikkinen15-893/+596
- Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I452f44a464e8da80ee4c0c38de6ec6abfd6ac285 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
2014-08-09Bump versionOswald Buddenhagen1-1/+1
Change-Id: I6cef2ec2af797fb7ae1b98241424b2694878bec5
2014-07-07Doc: Removing url variable from qdocconf file.Jerome Pasion1-1/+0
-url inherited from the url variable set in qtbase/doc/global Change-Id: I8491c5c29e7278eb50d27062e3cdcaf0bfccaac0 Reviewed-by: Martin Smith <martin.smith@digia.com>
2014-06-26Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I29cb249c95dfed1e8d3f356d52bfe7c73c13c786
2014-06-18Bump versionOswald Buddenhagen1-1/+1
Change-Id: Ia99459e3fda29a937feac06b63610394fda43684
2014-06-11Doc: Fix qmlclass selector used in documentation configTopi Reinio1-1/+1
A recent change (46959875) in qdoc raised QML types from subnodes to top-level nodes. This change modifies the documentation configuration file(s) accordingly. Change-Id: I0444e3860b15458b782982b5382469056022637c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
2014-05-09Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I5a75f8070bf8e0c4fb52ee8eabecba2fa75b5f1f
2014-04-22Bump MODULE_VERSION to 5.3.1upstream/5.3.1upstream/5.3.0upstream/5.2.96+rc2upstream/5.2.95+rc1Sergio Ahumada1-1/+1
Change-Id: Ic647a5bb39de64d02fb5d98cbda8c7f398ce8f1e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-02-20Bump module version to 5.4.0Thiago Macieira1-1/+1
Change-Id: Ibe73377ed23dab372340712ca64b40b176dcc249 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-10Merge remote-tracking branch 'origin/stable' into devupstream/5.2.90+alphaSergio Ahumada1-1/+1
Change-Id: I82b917891d9d835ccf62b0765a43936cfc50611b
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 01:08:44 +0000