summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* remove unnecessary CONFIG additionv5.0.0Oswald Buddenhagen2012-12-161-1/+1
| | | | | | | qt is already added by spec_pre.prf. Change-Id: I72dc555583e5a3453050eab876f34cece8e00b47 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove symbian vestigesv5.0.0-rc2v5.0.0-rc1Oswald Buddenhagen2012-12-041-3/+1
| | | | | Change-Id: I7b3c4862af09fa7c0d79938c7729573173891234 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada2012-12-041-4/+4
| | | | | | | | | | | | 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>
* Add \qmlmodule to Qt Graphical EffectsGunnar Sletta2012-11-301-0/+20
| | | | | Change-Id: I92ebde6a189442a2f6cc8c37d7bc3582551159fe Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-203-20/+13
|\ | | | | | | Change-Id: If1ebf43ab59293eb86db2a1ffab5677c708cb93e
| * Doc: Cleaned up QDoc config file and enabled "make docs" for the moduleJerome Pasion2012-11-163-19/+13
| | | | | | | | | | Change-Id: I7ccaccdefb92676e0f689c3d5101934fd7d574e2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * Doc: Removed the HTML template from the .qdocconf filesJerome Pasion2012-10-291-1/+0
| | | | | | | | | | | | | | -qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I0c6e02517f0bd452d45a3729588696d183ec5dbc Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-261-0/+1
| |\ | | | | | | | | | Change-Id: If531749e5b7113e693edb340ffe82f76ebe16c6b
* | | remove pointless module pri fileOswald Buddenhagen2012-11-091-16/+0
| | | | | | | | | | | | | | | | | | | | | this is no c++ module Change-Id: Iff9002b5edd556a0d6f954fd6f58a1a099f4dc14 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | test: Remove unused opengl dependencyv5.0.0-beta2Sergio Ahumada2012-10-311-1/+1
| |/ |/| | | | | | | Change-Id: I8c00ae2974c9697602214a0e46df98b86adbf35c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Add .qmake.conf with load(qt_build_config) like other Qt modulesTor Arne Vestbø2012-10-221-0/+1
|/ | | | | Change-Id: I4d545e308702d6f99e6e92358ae40887d02c2c37 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* HTML template: Updated copyright notice from Nokia to Digia PlcJerome Pasion2012-09-262-29/+4
| | | | | Change-Id: If06ef2a81e9af6384562c605df8485980e864f08 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Modularized documentation.Jerome Pasion2012-09-25351-5405/+4340
| | | | | | | | | | -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>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24143-1275/+1275
| | | | | | | | | 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>
* Doc: Adding documentation templates from qtbaseJerome Pasion2012-09-223-0/+776
| | | | | | | | | 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>
* Update the git-archive export optionsThiago Macieira2012-09-032-0/+4
| | | | | | | | | | | | | | 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>
* Convert the effects.pro file into a qml_module so it gets installedv5.0.0-beta1Lars Knoll2012-08-171-21/+35
| | | | | | Change-Id: Ice5fc4590ea682607e1f1fed4e8694cc3bd4f654 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Doc: Changed HTML filename of the main page.Jerome Pasion2012-08-031-1/+1
| | | | | | | -index.html collides with the main Qt 5 documentation. Change-Id: I7dda594362f34031f203c31298ae269ddd136fd4 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Doc: Changed \qmlclass to \qmltype.Jerome Pasion2012-07-2925-25/+25
| | | | | | | -\qmlclass is now \qmltype. Using \qmlclass outputs a warning. Change-Id: I23226f4885778a42750d7fe5c79b06a5b0284dc0 Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
* use centralized handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-091-13/+1
| | | | | Change-Id: I6c0ba15d08979f06e32b6d5f15625a0decceed5f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* there is no c++ modules here, don't pretendOswald Buddenhagen2012-07-091-9/+0
| | | | | | Change-Id: If29deb1c66805def1734cf247af96311ee025a64 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* switch to new way of generating forwarding module prisOswald Buddenhagen2012-07-092-4/+9
| | | | | | | | 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>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-07-091-1/+1
| | | | | | | | | | 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>
* Renamed 'internal' folder to 'private'.Marko Niemelä2012-06-1334-26/+26
| | | | | | | | 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>
* Removed unnecessary entry from qmldir.Marko Niemelä2012-06-131-1/+0
| | | | | Change-Id: I9391fc22b93a4c993ec7db25420332e5116e9692 Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
* Fixed all documentation property links.Marko Niemelä2012-06-1325-139/+139
| | | | | | | | | | 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>
* Doc: Removed list in the index page.Jerome Pasion2012-06-121-64/+1
| | | | | | | | 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>
* Doc: Grouped the effects and added an overview page for the effects.Jerome Pasion2012-06-1226-0/+100
| | | | | | | | | | | | | | | | | 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>
* Doc: Fixing linksJerome Pasion2012-06-1218-47/+47
| | | | | | | | -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>
* Port pngdumper to the new plugin formatLars Knoll2012-06-012-3/+2
| | | | | Change-Id: I48d6b716f309323e1df35a2d0d6e5d914fcf0f54 Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
* sync.profile: remove dependency on qtsvg.Toby Tomkins2012-05-231-1/+0
| | | | | | | | 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>
* Fixed BrightnessContrast.qml file permissionsMarko Niemelä2012-05-181-0/+0
| | | | | | Change-Id: I86d5ebccbb78418854f8a81a2c948bbb5d470ec8 Reviewed-by: Antti Sinnemaa <antti.sinnemaa@nokia.com> Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
* Don't use QtDeclarative compat moduleSergio Ahumada2012-05-186-86/+86
| | | | | | | Use QtQml instead. Change-Id: I88479de928a358a521efded01c68ac2c37f953bb Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
* BrightnessContrast effect brightness handling fixed.Marko Niemelä2012-05-141-4/+2
| | | | | | | | | 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>
* Avoid potential division by zero in DirectionalBlur.Marko Niemelä2012-04-271-1/+1
| | | | | Change-Id: I5582aa85cc834976004fa730a9902b9d3758575d Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
* Removed unnecessary internal ShaderEffectSources.Marko Niemelä2012-04-273-34/+5
| | | | | | | | | 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>
* Fix qtgraphicaleffects testsAlexey Andriyashin2012-04-261-3/+2
| | | | | Change-Id: I2cd6d966242c9219a98fd58498174ef51fc5c0fc Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
* Fixed some property types in documentation.Marko Niemelä2012-04-193-3/+3
| | | | | | | | | 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>
* Renamed documentation html root page to index.htmlMarko Niemelä2012-04-111-1/+1
| | | | | Change-Id: I59005b1fe2aeade42ce612c4e28c7566f742b3c1 Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
* Documentation updated.Marko Niemelä2012-04-1191-113/+107
| | | | | | | | | 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>
* Optimized Directional, Radial and ZoomBlur effects.Marko Niemelä2012-04-053-14/+10
| | | | | | | | | 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>
* Fix pngdumper. Reduce execution time. Reduce maximum number of blur samples.Alexey Andriyashin2012-03-297-34/+48
| | | | | | Change-Id: I862d99dc725909aba0eb01fce5622f76eba5153b Reviewed-by: Sami Hietanen <sami.k.hietanen@nokia.com> Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
* Minor changes to documentation overview page.Marko Niemelä2012-03-271-10/+10
| | | | | | | 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>
* Updated documentation overview pageqt-v5.0.0-alpha1Marko Niemelä2012-03-261-11/+21
| | | | | Change-Id: I4c0f2b11402e4051083ffaecc29a80f261bdd3e8 Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
* Added \since and \inherits tags to all qdocsMarko Niemelä2012-03-2325-0/+50
| | | | | | | | | 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>
* Added version number into qdoc module qualifier tags.Marko Niemelä2012-03-2326-199/+199
| | | | | Change-Id: I07dc13fef9a73f70f4b990805b8df8a7822a33ea Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
* Documentation is now generated using qdoc instead of qdoc3Marko Niemelä2012-03-2327-1424/+1424
| | | | | | | | 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>
* ConicalGradient modified to produce sharp gradient edge.Marko Niemelä2012-03-231-3/+2
| | | | | | | | | | | | | 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>
* Whitespaces cleaned from qdoc filesMarko Niemelä2012-03-226-18/+18
| | | | | Change-Id: I300755f93d315073ba556ddf3466ab8c5e407a3a Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
* Updated documentation module overview.Marko Niemelä2012-03-161-2/+10
| | | | | Change-Id: Icb1b0ced6476c7478eba1f80e09b0d4018d5cb53 Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
View Lorry Controller Status