aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-6/+6
|\ \ \ | | | | | | | | | | | | Change-Id: I7fab4ce7041dc8b7dc93d09d2c026be23975d58d
* | | | Propegate "transparentBorder" to the correct ShaderEffectSourceGunnar Sletta2013-02-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SourceProxy in the internal GaussianGlow class propegated the sourceRect, but at that point it was already too late as the source is already wrapped in another SourceProxy (as a ShaderEffectSource) which only had the default sourceRectangle. Task-number: QTBUG-29259 Change-Id: Iaf5ee44a2ef0d962e254fd52fc021aecd757221d Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | | Merge remote-tracking branch 'origin/stable' into devGunnar Sletta2013-02-056-784/+4
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I550ba62203b0a5c4020181330185e77781dc76af
* \ \ \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17121-126/+175
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile Change-Id: Idd8799885298e5fcef5ecc2c40bf0688fa6aa995
* | | | | | sync.profile: Point dependencies to 'refs/heads/dev'wip/androidSergio Ahumada2012-12-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | | * | Merge remote-tracking branch 'origin/release' into stableOswald Buddenhagen2013-03-181-0/+2
| | | |/| | | | | | |/ | | | | | | | | | | Change-Id: I548e33c0d8c7b1c707d5be6ee2395bb313219e6f
| | | | * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I5a22a7a580f6e2740eb8510c8eb684475fafb72d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | | * Merge branch 'stable' into releaseJohanna Aijala2013-02-21122-876/+125
| | | | |\ | | | | |/ | | | |/| | | | | | Change-Id: Icb76f5934f37e90c0aec1524f5fe0b23add59c15
| | | * | fix doc page urlsOswald Buddenhagen2013-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they are versioned nowadays Change-Id: I3293f6891b7da657a440b6ac595288e54ecf23e9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | | * | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-5/+5
| | |/ / | | | | | | | | | | | | | | | | Change-Id: If7c1440def877d26e93a7f44f51a51a625701c46 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | Merge branch 'release' into stableSergio Ahumada2013-01-312-32/+3
| | |\| | | | | | | | | | | | | Change-Id: I925f12d3a45bfaef51387b194da9d48605ee346d
| | | * Doc: Add QML Types to table of contents in Assistantv5.0.1Jerome Pasion2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'headerfile' with 'qmlclass' in qdocconf file. As a positive side-effect, QDoc will also add files for 'All members' for QML Types into .qhp as well. Task-number: QTBUG-29226 Change-Id: Ibdea992292e379c3759105685dcd19a3a809e475 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| | | * Doc: Fixed "QML Type" node in Assistant.Jerome Pasion2013-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed "class" from the qdocconf "selectors" variable. Task-number: QTBUG-29242 Change-Id: I4d62e85c23ff0b0bd72e7fb3907bc5aa3f14efe3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| | | * Update changes file for 5.0.1 releaseSergio Ahumada2013-01-161-30/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibb7e5198b1101d2a9b7547768e08abcdb209737e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | | * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I43e7eae9e5119da24024cbabf2e17fc26334b554 Reviewed-by: hjk <qthjk@ovi.com>
| | | * Merge branch 'stable' into releaseSergio Ahumada2013-01-092-4/+55
| | | |\ | | | | | | | | | | | | | | | Change-Id: I00358ee7fb55d5cc5537c3935a4de611c2381545
| | | * | point dependencies to 'release' branchesSergio Ahumada2012-12-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice1954729a9f5ab0ead33adbe49c277f39584729 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * | | purge useless doc/global dirOswald Buddenhagen2013-01-303-751/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these files are part of the default qdoc settings already. Change-Id: I68f90cfbca2c90df07ad67b9f81338d47f02714f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | | SourceProxy.qml: removing binding 'output: input'Thomas Senyk2013-01-261-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The binding is redundant as onInputChanged will always trigger setting output Also the binding does generate binding-loop errors Change-Id: Iaa1df71a633f4bbd0554d81bb807db59a02974ee Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | / Update copyright year in Digia's license headersSergio Ahumada2013-01-10118-118/+118
| | |/ | |/| | | | | | | | | | | | | Change-Id: Idaf2ac8f4dc2a8586c6e148bd67a33e9bdd677e1 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Add changes-5.0.1 fileSergio Ahumada2013-01-031-0/+51
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: I57bc3a83b07a393762b644e2b55bf11a8a57b34a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Bump Qt version to 5.0.1Sergio Ahumada2013-01-021-4/+4
| |/ | | | | | | | | Change-Id: I21883e2e71e6a720b71773f48c6b14867056b6b0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 07:35:16 +0000