summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
* Merge branch 'dev' into stableSergio Ahumada2013-03-192-0/+2
|\
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-6/+6
| |\
| * | Propegate "transparentBorder" to the correct ShaderEffectSourceGunnar Sletta2013-02-062-0/+2
| * | Merge remote-tracking branch 'origin/stable' into devGunnar Sletta2013-02-056-784/+4
| |\ \
| * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17121-126/+175
| |\ \ \
| * | | | sync.profile: Point dependencies to 'refs/heads/dev'wip/androidSergio Ahumada2012-12-131-4/+4
* | | | | Merge remote-tracking branch 'origin/release' into stableOswald Buddenhagen2013-03-181-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| * | | | Merge branch 'stable' into releaseJohanna Aijala2013-02-21122-876/+125
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | fix doc page urlsOswald Buddenhagen2013-02-061-1/+1
* | | | | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-5/+5
| |_|_|/ |/| | |
* | | | Merge branch 'release' into stableSergio Ahumada2013-01-312-32/+3
|\ \ \ \ | |/ / /
| * | | Doc: Add QML Types to table of contents in Assistantv5.0.1Jerome Pasion2013-01-281-1/+1
| * | | Doc: Fixed "QML Type" node in Assistant.Jerome Pasion2013-01-221-1/+1
| * | | Update changes file for 5.0.1 releaseSergio Ahumada2013-01-161-30/+1
| * | | doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| * | | Merge branch 'stable' into releaseSergio Ahumada2013-01-092-4/+55
| |\ \ \
| * | | | point dependencies to 'release' branchesSergio Ahumada2012-12-181-4/+4
* | | | | purge useless doc/global dirOswald Buddenhagen2013-01-303-751/+0
* | | | | SourceProxy.qml: removing binding 'output: input'Thomas Senyk2013-01-261-1/+1
| |_|_|/ |/| | |
* | | | Update copyright year in Digia's license headersSergio Ahumada2013-01-10118-118/+118
| |/ / |/| |
* | | Add changes-5.0.1 fileSergio Ahumada2013-01-031-0/+51
* | | Bump Qt version to 5.0.1Sergio Ahumada2013-01-021-4/+4
|/ /
* | remove unnecessary CONFIG additionv5.0.0Oswald Buddenhagen2012-12-161-1/+1
* | remove symbian vestigesv5.0.0-rc2v5.0.0-rc1Oswald Buddenhagen2012-12-041-3/+1
* | sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada2012-12-041-4/+4
|/
* Add \qmlmodule to Qt Graphical EffectsGunnar Sletta2012-11-301-0/+20
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-203-20/+13
|\
| * Doc: Cleaned up QDoc config file and enabled "make docs" for the moduleJerome Pasion2012-11-163-19/+13
| * Doc: Removed the HTML template from the .qdocconf filesJerome Pasion2012-10-291-1/+0
| * Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-261-0/+1
| |\
* | | remove pointless module pri fileOswald Buddenhagen2012-11-091-16/+0
* | | test: Remove unused opengl dependencyv5.0.0-beta2Sergio Ahumada2012-10-311-1/+1
| |/ |/|
* | Add .qmake.conf with load(qt_build_config) like other Qt modulesTor Arne Vestbø2012-10-221-0/+1
|/
* HTML template: Updated copyright notice from Nokia to Digia PlcJerome Pasion2012-09-262-29/+4
* Doc: Modularized documentation.Jerome Pasion2012-09-25351-5405/+4340
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24143-1275/+1275
* Doc: Adding documentation templates from qtbaseJerome Pasion2012-09-223-0/+776
* Update the git-archive export optionsThiago Macieira2012-09-032-0/+4
* Convert the effects.pro file into a qml_module so it gets installedv5.0.0-beta1Lars Knoll2012-08-171-21/+35
* Doc: Changed HTML filename of the main page.Jerome Pasion2012-08-031-1/+1
* Doc: Changed \qmlclass to \qmltype.Jerome Pasion2012-07-2925-25/+25
* use centralized handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-091-13/+1
* there is no c++ modules here, don't pretendOswald Buddenhagen2012-07-091-9/+0
* switch to new way of generating forwarding module prisOswald Buddenhagen2012-07-092-4/+9
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-07-091-1/+1
* Renamed 'internal' folder to 'private'.Marko Niemelä2012-06-1334-26/+26
* Removed unnecessary entry from qmldir.Marko Niemelä2012-06-131-1/+0
* Fixed all documentation property links.Marko Niemelä2012-06-1325-139/+139