qt:qtgraphicaleffects.git
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Thu, 17 Jan 2013 17:23:27 +0000 (18:23 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
sync.profile

Change-Id: Idd8799885298e5fcef5ecc2c40bf0688fa6aa995

4 years agoUpdate copyright year in Digia's license headers
Sergio Ahumada [Wed, 2 Jan 2013 11:42:36 +0000 (12:42 +0100)]
Update copyright year in Digia's license headers

Change-Id: Idaf2ac8f4dc2a8586c6e148bd67a33e9bdd677e1
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoAdd changes-5.0.1 file
Sergio Ahumada [Sat, 22 Dec 2012 15:55:42 +0000 (16:55 +0100)]
Add changes-5.0.1 file

Task-number: QTBUG-26065
Change-Id: I57bc3a83b07a393762b644e2b55bf11a8a57b34a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoBump Qt version to 5.0.1
Sergio Ahumada [Fri, 21 Dec 2012 23:38:33 +0000 (00:38 +0100)]
Bump Qt version to 5.0.1

Change-Id: I21883e2e71e6a720b71773f48c6b14867056b6b0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agoremove unnecessary CONFIG addition v5.0.0
Oswald Buddenhagen [Fri, 14 Dec 2012 18:24:50 +0000 (19:24 +0100)]
remove unnecessary CONFIG addition

qt is already added by spec_pre.prf.

Change-Id: I72dc555583e5a3453050eab876f34cece8e00b47
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
4 years agosync.profile: Point dependencies to 'refs/heads/dev' wip/android
Sergio Ahumada [Wed, 12 Dec 2012 21:11:54 +0000 (22:11 +0100)]
sync.profile: Point dependencies to 'refs/heads/dev'

We should test dev branches against dev branches only by default.
At some point we should automate the merges from release->stable->dev
and/or decide how to handle possible conflicts.

This is good enough for the time being.

Change-Id: Ie5e27d7f65f6c306acb71c89b769600a46fe1150
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agoremove symbian vestiges v5.0.0-rc1 v5.0.0-rc2
Oswald Buddenhagen [Mon, 3 Dec 2012 20:37:03 +0000 (21:37 +0100)]
remove symbian vestiges

Change-Id: I7b3c4862af09fa7c0d79938c7729573173891234
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agosync.profile: Point dependencies to 'refs/heads/stable'
Sergio Ahumada [Tue, 4 Dec 2012 10:28:20 +0000 (11:28 +0100)]
sync.profile: Point dependencies to 'refs/heads/stable'

We should test stable branches against stable branches only.
At some point we should automate the merges from dev->stable->release
and decide how to handle possible merge conflicts.

This is good enough for the time being.

Change-Id: I8db5292f202bdaf11ae672f90d2ab5bc0cfe1b7f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
4 years agoAdd \qmlmodule to Qt Graphical Effects
Gunnar Sletta [Fri, 30 Nov 2012 07:55:57 +0000 (08:55 +0100)]
Add \qmlmodule to Qt Graphical Effects

Change-Id: I92ebde6a189442a2f6cc8c37d7bc3582551159fe
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
4 years agoMerge branch 'newdocs'
Eskil Abrahamsen Blomfeldt [Tue, 20 Nov 2012 09:21:07 +0000 (10:21 +0100)]
Merge branch 'newdocs'

Change-Id: If1ebf43ab59293eb86db2a1ffab5677c708cb93e

4 years agoDoc: Cleaned up QDoc config file and enabled "make docs" for the module
Jerome Pasion [Tue, 13 Nov 2012 11:40:22 +0000 (12:40 +0100)]
Doc: Cleaned up QDoc config file and enabled "make docs" for the module

Change-Id: I7ccaccdefb92676e0f689c3d5101934fd7d574e2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
4 years agoremove pointless module pri file
Oswald Buddenhagen [Fri, 21 Sep 2012 12:49:17 +0000 (14:49 +0200)]
remove pointless module pri file

this is no c++ module

Change-Id: Iff9002b5edd556a0d6f954fd6f58a1a099f4dc14
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
4 years agotest: Remove unused opengl dependency v5.0.0-beta2
Sergio Ahumada [Tue, 30 Oct 2012 23:56:56 +0000 (00:56 +0100)]
test: Remove unused opengl dependency

Change-Id: I8c00ae2974c9697602214a0e46df98b86adbf35c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
4 years agoDoc: Removed the HTML template from the .qdocconf files
Jerome Pasion [Fri, 26 Oct 2012 13:18:47 +0000 (15:18 +0200)]
Doc: Removed the HTML template from the .qdocconf files

-qt-module-defaults.qdocconf already contains the HTML template.

Change-Id: I0c6e02517f0bd452d45a3729588696d183ec5dbc
Reviewed-by: Martin Smith <martin.smith@digia.com>
4 years agoMerge remote-tracking branch 'gerrit/master' into newdocs
Tor Arne Vestbø [Fri, 26 Oct 2012 10:25:43 +0000 (12:25 +0200)]
Merge remote-tracking branch 'gerrit/master' into newdocs

Change-Id: If531749e5b7113e693edb340ffe82f76ebe16c6b

4 years agoAdd .qmake.conf with load(qt_build_config) like other Qt modules
Tor Arne Vestbø [Mon, 22 Oct 2012 11:03:20 +0000 (13:03 +0200)]
Add .qmake.conf with load(qt_build_config) like other Qt modules

Change-Id: I4d545e308702d6f99e6e92358ae40887d02c2c37
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoHTML template: Updated copyright notice from Nokia to Digia Plc
Jerome Pasion [Tue, 25 Sep 2012 10:11:12 +0000 (12:11 +0200)]
HTML template: Updated copyright notice from Nokia to Digia Plc

Change-Id: If06ef2a81e9af6384562c605df8485980e864f08
Reviewed-by: Martin Smith <martin.smith@digia.com>
4 years agoDoc: Modularized documentation.
Jerome Pasion [Mon, 24 Sep 2012 14:57:55 +0000 (16:57 +0200)]
Doc: Modularized documentation.

-moved API documentation in QML files
-moved snippets, images, and qdoc files to src/effects/doc
-deleted old .pri and .qdocconf files
-fixed relative paths

Change-Id: I4e757e707b5f93a215506f8c2cbb7eb1f2321d4c
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
4 years agoChange copyrights from Nokia to Digia
Iikka Eklund [Thu, 20 Sep 2012 11:44:55 +0000 (14:44 +0300)]
Change copyrights from Nokia to Digia

Change copyrights and license headers from Nokia to Digia

Change-Id: I06d9e8f818910ab9243afb73087f187a4b3b05f4
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoDoc: Adding documentation templates from qtbase
Jerome Pasion [Fri, 21 Sep 2012 12:10:13 +0000 (14:10 +0200)]
Doc: Adding documentation templates from qtbase

qdocconf files must include these templates for qdoc to create HTML
files.

Task-number: QTBUG-27293
Change-Id: Iaaf722e2db5f46c489d8a7730d031dad4c2046d9
Reviewed-by: Martin Smith <martin.smith@digia.com>
5 years agoUpdate the git-archive export options
Thiago Macieira [Wed, 29 Aug 2012 19:40:03 +0000 (21:40 +0200)]
Update the git-archive export options

The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the $n string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: I805d78682cb3c74e22e9fe7e08db14337fa76a8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoConvert the effects.pro file into a qml_module so it gets installed v5.0.0-beta1
Lars Knoll [Mon, 6 Aug 2012 10:53:27 +0000 (12:53 +0200)]
Convert the effects.pro file into a qml_module so it gets installed

Change-Id: Ice5fc4590ea682607e1f1fed4e8694cc3bd4f654
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoDoc: Changed HTML filename of the main page.
Jerome Pasion [Fri, 3 Aug 2012 10:05:46 +0000 (12:05 +0200)]
Doc: Changed HTML filename of the main page.

-index.html collides with the main Qt 5 documentation.

Change-Id: I7dda594362f34031f203c31298ae269ddd136fd4
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
5 years agoDoc: Changed \qmlclass to \qmltype.
Jerome Pasion [Fri, 27 Jul 2012 16:34:51 +0000 (18:34 +0200)]
Doc: Changed \qmlclass to \qmltype.

-\qmlclass is now \qmltype. Using \qmlclass outputs a warning.

Change-Id: I23226f4885778a42750d7fe5c79b06a5b0284dc0
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agouse centralized handling of QT_BUILD_PARTS
Oswald Buddenhagen [Tue, 3 Jul 2012 19:37:43 +0000 (21:37 +0200)]
use centralized handling of QT_BUILD_PARTS

Change-Id: I6c0ba15d08979f06e32b6d5f15625a0decceed5f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agothere is no c++ modules here, don't pretend
Oswald Buddenhagen [Thu, 5 Jul 2012 13:33:17 +0000 (15:33 +0200)]
there is no c++ modules here, don't pretend

Change-Id: If29deb1c66805def1734cf247af96311ee025a64
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoswitch to new way of generating forwarding module pris
Oswald Buddenhagen [Thu, 5 Jul 2012 11:55:47 +0000 (13:55 +0200)]
switch to new way of generating forwarding module pris

we really need a qt_qml_module.prf file for such things ...

Change-Id: I9c39d402e0e0e1db1a97d61d323d69855d87eab6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoChange uses of {to,from}Ascii to {to,from}Latin1
Thiago Macieira [Thu, 3 May 2012 15:16:03 +0000 (17:16 +0200)]
Change uses of {to,from}Ascii to {to,from}Latin1

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I94117ba5452fc75684d1a576a12c294fd4c60a91
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoRenamed 'internal' folder to 'private'.
Marko Niemelä [Wed, 13 Jun 2012 10:00:33 +0000 (13:00 +0300)]
Renamed 'internal' folder to 'private'.

Private is more widely used term for files that
do not belong to public API.

Change-Id: Ib4219a4026bc04f79f0803272f8af6a13b517ca8
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoRemoved unnecessary entry from qmldir.
Marko Niemelä [Wed, 13 Jun 2012 09:45:08 +0000 (12:45 +0300)]
Removed unnecessary entry from qmldir.

Change-Id: I9391fc22b93a4c993ec7db25420332e5116e9692
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoFixed all documentation property links.
Marko Niemelä [Wed, 13 Jun 2012 06:51:34 +0000 (09:51 +0300)]
Fixed all documentation property links.

For example QtGraphicalEffects1.0::Blend::source
did not seem to work anymore, so it is now replaced
by QtGraphicalEffects1::Blend::source.

Change-Id: Id1e950a1e2a80396b7bb8816b7af4f1a94973a49
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Michalina Ziemba <michalina.ziemba@nokia.com>
5 years agoDoc: Removed list in the index page.
Jerome Pasion [Mon, 11 Jun 2012 11:10:20 +0000 (13:10 +0200)]
Doc: Removed list in the index page.

Linked to the Graphical Effects page.

Change-Id: I34a58c37c419db0d452b9b02529529b4685a8177
Reviewed-by: Michalina Ziemba <michalina.ziemba@nokia.com>
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoDoc: Grouped the effects and added an overview page for the effects.
Jerome Pasion [Mon, 11 Jun 2012 10:35:57 +0000 (12:35 +0200)]
Doc: Grouped the effects and added an overview page for the effects.

Groups:
qtgraphicaleffects-blend
qtgraphicaleffects-color
qtgraphicaleffects-gradient
qtgraphicaleffects-distortion
qtgraphicaleffects-drop-shadow
qtgraphicaleffects-blur
qtgraphicaleffects-motion-blur
qtgraphicaleffects-glow
qtgraphicaleffects-mask

Change-Id: I5ffbbcc2fed1793af3de7c50b13ffb26b9e415cb
Reviewed-by: Michalina Ziemba <michalina.ziemba@nokia.com>
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoDoc: Fixing links
Jerome Pasion [Mon, 11 Jun 2012 08:44:20 +0000 (10:44 +0200)]
Doc: Fixing links

-added the QML module identifier in the links.

Change-Id: I2ddc927d14cb2a25f63aaafdb22c233779db0b19
Reviewed-by: Michalina Ziemba <michalina.ziemba@nokia.com>
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoPort pngdumper to the new plugin format
Lars Knoll [Sun, 27 May 2012 10:00:49 +0000 (12:00 +0200)]
Port pngdumper to the new plugin format

Change-Id: I48d6b716f309323e1df35a2d0d6e5d914fcf0f54
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agosync.profile: remove dependency on qtsvg.
Toby Tomkins [Mon, 14 May 2012 04:10:00 +0000 (14:10 +1000)]
sync.profile: remove dependency on qtsvg.

sync.profile should not reference modules as dependencies unless they
are actually required; update sync.profile accordingly.

Change-Id: I1bce3fa5ad8f8c58867966afeba8b71edb49729b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoFixed BrightnessContrast.qml file permissions
Marko Niemelä [Tue, 15 May 2012 13:07:34 +0000 (16:07 +0300)]
Fixed BrightnessContrast.qml file permissions

Change-Id: I86d5ebccbb78418854f8a81a2c948bbb5d470ec8
Reviewed-by: Antti Sinnemaa <antti.sinnemaa@nokia.com>
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoDon't use QtDeclarative compat module
Sergio Ahumada [Fri, 18 May 2012 08:57:10 +0000 (10:57 +0200)]
Don't use QtDeclarative compat module

Use QtQml instead.

Change-Id: I88479de928a358a521efded01c68ac2c37f953bb
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoBrightnessContrast effect brightness handling fixed.
Marko Niemelä [Mon, 14 May 2012 06:22:47 +0000 (09:22 +0300)]
BrightnessContrast effect brightness handling fixed.

Brightness is now adjusted by mixing original pixels
to white or black instead of the previous way which
did not handle transparency correctly.

Change-Id: I3346376cbd79302a67cb1ae5045b4948b1f4115f
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoAvoid potential division by zero in DirectionalBlur.
Marko Niemelä [Wed, 25 Apr 2012 13:53:14 +0000 (16:53 +0300)]
Avoid potential division by zero in DirectionalBlur.

Change-Id: I5582aa85cc834976004fa730a9902b9d3758575d
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoRemoved unnecessary internal ShaderEffectSources.
Marko Niemelä [Wed, 25 Apr 2012 13:11:36 +0000 (16:11 +0300)]
Removed unnecessary internal ShaderEffectSources.

GaussianDirectionalBlur does not require source to
be ShaderEffectSource, it uses internal SourceProxy
when needed.

Change-Id: Ie6db1ddad5e245e7ae3a4563d07107b780eaa671
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoFix qtgraphicaleffects tests
Alexey Andriyashin [Wed, 25 Apr 2012 13:11:48 +0000 (16:11 +0300)]
Fix qtgraphicaleffects tests

Change-Id: I2cd6d966242c9219a98fd58498174ef51fc5c0fc
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoFixed some property types in documentation.
Marko Niemelä [Wed, 11 Apr 2012 10:32:32 +0000 (13:32 +0300)]
Fixed some property types in documentation.

ZoomBlur, DirectionalBlur and Radial blur had
incorrect type in their "samples" proerty. It
should be int, not real.

Change-Id: I73b48e8a5f8da2dc6d067677e82da3f69ce6c3b1
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoRenamed documentation html root page to index.html
Marko Niemelä [Tue, 10 Apr 2012 12:33:52 +0000 (15:33 +0300)]
Renamed documentation html root page to index.html

Change-Id: I59005b1fe2aeade42ce612c4e28c7566f742b3c1
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoDocumentation updated.
Marko Niemelä [Thu, 5 Apr 2012 06:37:07 +0000 (09:37 +0300)]
Documentation updated.

Documentation graphics updated to use bug.jpg image
as primary example, butterfly.png is used only when
needed. Color usage in example snippets unified.

Change-Id: Ie8381d6157d2548d59d11fc9bc2f5e47a17edc7b
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoOptimized Directional, Radial and ZoomBlur effects.
Marko Niemelä [Tue, 3 Apr 2012 10:47:57 +0000 (13:47 +0300)]
Optimized Directional, Radial and ZoomBlur effects.

Weight multiplication was inside the unrolled loop,
moved that to the end of the shader. Additionally
expand calculation is now done with vectors.

Change-Id: Idc27e9dfd2d6911d3e65d093fb043a07cb912a1c
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoFix pngdumper. Reduce execution time. Reduce maximum number of blur samples.
Alexey Andriyashin [Wed, 28 Mar 2012 08:19:56 +0000 (11:19 +0300)]
Fix pngdumper. Reduce execution time. Reduce maximum number of blur samples.

Change-Id: I862d99dc725909aba0eb01fce5622f76eba5153b
Reviewed-by: Sami Hietanen <sami.k.hietanen@nokia.com>
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoMinor changes to documentation overview page.
Marko Niemelä [Tue, 27 Mar 2012 12:34:24 +0000 (15:34 +0300)]
Minor changes to documentation overview page.

Change-Id: I513ecdbef57a49437b3e75e15bc0564412899929
Reviewed-by: Aleksi Uotila <aleksi.uotila@nokia.com>
Reviewed-by: Eero Hyyti <eero.hyyti@nokia.com>
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoUpdated documentation overview page qt-v5.0.0-alpha1
Marko Niemelä [Fri, 23 Mar 2012 14:21:06 +0000 (16:21 +0200)]
Updated documentation overview page

Change-Id: I4c0f2b11402e4051083ffaecc29a80f261bdd3e8
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoAdded \since and \inherits tags to all qdocs
Marko Niemelä [Tue, 20 Mar 2012 13:40:12 +0000 (15:40 +0200)]
Added \since and \inherits tags to all qdocs

All effects are now documented to inherit QML Item element
because Item is the root element for the effects. This is
the recommended way to document QML components.

Change-Id: I2b724de1be6deec9bbc1698bd3ff0e798252b755
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoAdded version number into qdoc module qualifier tags.
Marko Niemelä [Tue, 20 Mar 2012 13:09:15 +0000 (15:09 +0200)]
Added version number into qdoc module qualifier tags.

Change-Id: I07dc13fef9a73f70f4b990805b8df8a7822a33ea
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoDocumentation is now generated using qdoc instead of qdoc3
Marko Niemelä [Tue, 20 Mar 2012 12:30:01 +0000 (14:30 +0200)]
Documentation is now generated using qdoc instead of qdoc3

Additionally some qdoc markup definitions are changed to avoid
deprecation warnings during doc generation.

Change-Id: I91fe30d2e628069f7594406125e24210ae157af3
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoConicalGradient modified to produce sharp gradient edge.
Marko Niemelä [Tue, 20 Mar 2012 09:19:26 +0000 (11:19 +0200)]
ConicalGradient modified to produce sharp gradient edge.

Previously ConicalGradient produced smooth antialiased transition
between gradient position 1.0 and 0.0. However this suffered
from accuracy problem and transition was spreading more at
pixels that were far away from the gradient center. Thus is is
better to produce sharp consistent transition. Anti-aliased
look can still be achieved by defining the gradient steps and
colors in suitable way near the 1.0 position.

Change-Id: I67040c5c56fdf855fe68d9b3f0d9fde0cc37b59f
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoWhitespaces cleaned from qdoc files
Marko Niemelä [Tue, 20 Mar 2012 13:31:17 +0000 (15:31 +0200)]
Whitespaces cleaned from qdoc files

Change-Id: I300755f93d315073ba556ddf3466ab8c5e407a3a
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoUpdated documentation module overview.
Marko Niemelä [Fri, 16 Mar 2012 10:59:52 +0000 (12:59 +0200)]
Updated documentation module overview.

Change-Id: Icb1b0ced6476c7478eba1f80e09b0d4018d5cb53
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoAdded precision to all uniforms which did not have it.
Marko Niemelä [Wed, 14 Mar 2012 14:24:48 +0000 (16:24 +0200)]
Added precision to all uniforms which did not have it.

If precision qualifier is missing, shader compilation
may fail on some GPU:s.

Change-Id: I8bad4855203ba9f0b233a877b1a012c608801bd6
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoFixed InnerShadow color mixing.
Marko Niemelä [Tue, 13 Mar 2012 11:34:25 +0000 (13:34 +0200)]
Fixed InnerShadow color mixing.

Shadow color was incorrectly mixed with transparent black which
produced dirty-looking result for instance when shadow color was
set to white.

Both versions (fast and high quality) of InnerShadow are fixed.

Change-Id: I0af4b97c247c0890fb7d31767945a538fa4967d0
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoFixed RectangularGlow cache mode.
Marko Niemelä [Wed, 7 Mar 2012 13:55:21 +0000 (15:55 +0200)]
Fixed RectangularGlow cache mode.

Effect internal cache was incorreclty sized according to parent,
not shaderItem as it should be.

Change-Id: I7d9c8c034b9c0e4f5a8f65c223cd0b82ed807691
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoRemove pin of qtbase for qtgraphicaleffects.
Sergio Ahumada [Mon, 12 Mar 2012 22:04:32 +0000 (23:04 +0100)]
Remove pin of qtbase for qtgraphicaleffects.

Change-Id: I5b217fb50d14db237126fba6d6ce95017dfd8912
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agotst_qtgraphicaleffects: make the test work prior to installation
Rohan McGovern [Tue, 6 Mar 2012 01:11:50 +0000 (11:11 +1000)]
tst_qtgraphicaleffects: make the test work prior to installation

Tests should be working both before and after `make install'.
Adjust this test so it can load QtGraphicalEffects either from the
source tree or the install tree.

This code already attempted to accomplish this:

  engine.addImportPath("../../src");

It didn't work, since the directory in the source tree is named
"effects" and not "QtGraphicalEffects".  It also would not work when
the build tree and source tree are different.

Change-Id: Ied964714d72e041caa937a4204668fe4f86da3f5
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agotst_qtgraphicaleffects: fixed typo
Rohan McGovern [Tue, 6 Mar 2012 00:26:38 +0000 (10:26 +1000)]
tst_qtgraphicaleffects: fixed typo

lenght -> length

Change-Id: I406995cad6992e5f48e38ebcb6d94cfae2a1b9db
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agotst_qtgraphicaleffects: improved creation of components
Rohan McGovern [Tue, 6 Mar 2012 00:23:51 +0000 (10:23 +1000)]
tst_qtgraphicaleffects: improved creation of components

If errors occur, include them in the test failure message.

Verify that the component is ready before calling create().

Remove unnecessary QTest::qWait().

Change-Id: I6a63bafed859ab564c3e3fc7a044ac998e079fea
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoFix outdated license header
Sergio Ahumada [Wed, 22 Feb 2012 12:01:17 +0000 (13:01 +0100)]
Fix outdated license header

Change-Id: I210c10369f97ab8289bff3c3d7e6dc26d9215936
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
5 years agosync.profile: introduce dependency on qtjsbackend
Sergio Ahumada [Wed, 22 Feb 2012 14:46:26 +0000 (15:46 +0100)]
sync.profile: introduce dependency on qtjsbackend

sync.profile needs to enumerate indirect dependencies too.
qtdeclarative now depends on qtjsbackend; update sync.profile
accordingly.

Change-Id: I25dd515c1e98cd446db60215354a112a14ad50be
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
5 years agopin qtgraphicaleffects to qtbase/api_changes
Sergio Ahumada [Tue, 6 Mar 2012 14:35:00 +0000 (15:35 +0100)]
pin qtgraphicaleffects to qtbase/api_changes

This is a temporary solution until qtdeclarative is fixed,
since qtdeclarative is pinned to qtbase/api_changes

Change-Id: Ida95958f1a4270f759cb8d08022a2865780512b3
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoAdded missing qt_Opacity uniform handling to Desaturate effect
Marko Niemelä [Fri, 17 Feb 2012 11:23:55 +0000 (13:23 +0200)]
Added missing qt_Opacity uniform handling to Desaturate effect

Change-Id: I40db63a40850b985ccda492e400efb5b4ee047c9
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoAdded missing precision keywords for ThresholdMask shader
Marko Niemelä [Wed, 15 Feb 2012 13:04:22 +0000 (15:04 +0200)]
Added missing precision keywords for ThresholdMask shader

Change-Id: I252a25371f05de45bc6b240c7ebd84fbbdbfabe9
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
5 years agoAdded a config variable to auto tests' pro file
Sami Hietanen [Thu, 16 Feb 2012 09:47:29 +0000 (11:47 +0200)]
Added a config variable to auto tests' pro file

Change-Id: I2e46eeed1e966cb3677f12e9bfab6ec6598eb91e
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
5 years agoFixed the naming of pngdumper.sh
Sami Hietanen [Tue, 7 Feb 2012 13:22:49 +0000 (15:22 +0200)]
Fixed the naming of pngdumper.sh

5 years agoReduced pngdumper tool peak memory consumption
Marko Niemelä [Mon, 6 Feb 2012 12:38:13 +0000 (14:38 +0200)]
Reduced pngdumper tool peak memory consumption

5 years agoFixed autotests to work with latest Qt5
Marko Niemelä [Mon, 6 Feb 2012 12:35:46 +0000 (14:35 +0200)]
Fixed autotests to work with latest Qt5

5 years agoFixed ThresholdMask which did not use SourceProxy for maskSource property
Marko Niemelä [Fri, 3 Feb 2012 12:57:04 +0000 (14:57 +0200)]
Fixed ThresholdMask which did not use SourceProxy for maskSource property

5 years agoRemoved unnecessary alpha slider from Colorize test
Marko Niemelä [Wed, 1 Feb 2012 14:08:32 +0000 (16:08 +0200)]
Removed unnecessary alpha slider from Colorize test

5 years agoTestBed RecursiveBlur slider range adjusted
Marko Niemelä [Wed, 1 Feb 2012 14:07:36 +0000 (16:07 +0200)]
TestBed RecursiveBlur slider range adjusted

5 years agoRadialBlur offset and angle interpretation changed
Marko Niemelä [Wed, 1 Feb 2012 09:08:03 +0000 (11:08 +0200)]
RadialBlur offset and angle interpretation changed

5 years agoTestBed to show only one decimal for position values
Marko Niemelä [Wed, 1 Feb 2012 07:58:55 +0000 (09:58 +0200)]
TestBed to show only one decimal for position values

5 years agoTestBed progressBar aligment fixed
Marko Niemelä [Wed, 1 Feb 2012 07:58:12 +0000 (09:58 +0200)]
TestBed progressBar aligment fixed

5 years agoTestBed slider fixed to show integers without decimals
Marko Niemelä [Wed, 1 Feb 2012 07:57:33 +0000 (09:57 +0200)]
TestBed slider fixed to show integers without decimals

5 years agoTestBed slider value aligment corrected
Marko Niemelä [Wed, 1 Feb 2012 07:45:43 +0000 (09:45 +0200)]
TestBed slider value aligment corrected

5 years agoTestBed label value color corrected
Marko Niemelä [Wed, 1 Feb 2012 07:45:01 +0000 (09:45 +0200)]
TestBed label value color corrected

5 years agoBlend effect to handle background alpha
Marko Niemelä [Wed, 1 Feb 2012 07:15:11 +0000 (09:15 +0200)]
Blend effect to handle background alpha

5 years agoTestBed effect selection highlight improved
Marko Niemelä [Tue, 31 Jan 2012 15:00:12 +0000 (17:00 +0200)]
TestBed effect selection highlight improved

5 years agoFixed TestBed HSL color picker
Marko Niemelä [Tue, 31 Jan 2012 13:06:59 +0000 (15:06 +0200)]
Fixed TestBed HSL color picker

5 years agoTestBed background rect changed to be square
Marko Niemelä [Tue, 31 Jan 2012 09:34:43 +0000 (11:34 +0200)]
TestBed background rect changed to be square

5 years agoOptimized FastBlur source downscaling
Marko Niemelä [Mon, 30 Jan 2012 11:10:18 +0000 (13:10 +0200)]
Optimized FastBlur source downscaling

5 years agoTestBed effect selection highlight behavior changed
Marko Niemelä [Mon, 30 Jan 2012 08:55:16 +0000 (10:55 +0200)]
TestBed effect selection highlight behavior changed

5 years agoRelocated position picker rounding in TestBed
Marko Niemelä [Mon, 30 Jan 2012 08:10:51 +0000 (10:10 +0200)]
Relocated position picker rounding in TestBed

5 years agoFixed MaskedBlur transparentBorder
Marko Niemelä [Mon, 30 Jan 2012 07:39:39 +0000 (09:39 +0200)]
Fixed MaskedBlur transparentBorder

5 years agoDeleted system test result images
Marko Niemelä [Thu, 26 Jan 2012 12:27:45 +0000 (14:27 +0200)]
Deleted system test result images

5 years agoMore intuitive test UI controls for LevelAdjust effect
Marko Niemelä [Thu, 26 Jan 2012 12:26:58 +0000 (14:26 +0200)]
More intuitive test UI controls for LevelAdjust effect

5 years agoRenamed DirectionaGaussianBlur -> GaussianDirectionalBlur
Marko Niemelä [Wed, 25 Jan 2012 08:42:30 +0000 (10:42 +0200)]
Renamed DirectionaGaussianBlur -> GaussianDirectionalBlur

5 years agoRemoved if-else from DirectionalGaussianBlur
Marko Niemelä [Wed, 25 Jan 2012 08:37:42 +0000 (10:37 +0200)]
Removed if-else from DirectionalGaussianBlur

5 years agoRemoved some unused uniforms and properties
Marko Niemelä [Wed, 25 Jan 2012 08:12:17 +0000 (10:12 +0200)]
Removed some unused uniforms and properties

5 years agoOptimized Glow by ubershaderifying DirectionalGaussianBlur
Marko Niemelä [Wed, 25 Jan 2012 07:40:41 +0000 (09:40 +0200)]
Optimized Glow by ubershaderifying DirectionalGaussianBlur

5 years agoBackground color selection update
Antti Sinnemaa [Tue, 24 Jan 2012 15:34:14 +0000 (17:34 +0200)]
Background color selection update

5 years agoTestBed BGColorPicker amout of hardcoded values reduced
Marko Niemelä [Tue, 24 Jan 2012 14:32:49 +0000 (16:32 +0200)]
TestBed BGColorPicker amout of hardcoded values reduced

5 years agoTestBed postionPicker to show only 2 decimals
Marko Niemelä [Tue, 24 Jan 2012 14:02:31 +0000 (16:02 +0200)]
TestBed postionPicker to show only 2 decimals

5 years agoTestBed control height animation initially disabled
Marko Niemelä [Tue, 24 Jan 2012 13:57:54 +0000 (15:57 +0200)]
TestBed control height animation initially disabled

5 years agoColor updates
Antti Sinnemaa [Tue, 24 Jan 2012 13:26:36 +0000 (15:26 +0200)]
Color updates

5 years agoDisplace effect docs updated
Marko Niemelä [Tue, 24 Jan 2012 13:04:14 +0000 (15:04 +0200)]
Displace effect docs updated