aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump MODULE_VERSION to 5.3.1v5.3.1Sergio Ahumada2014-04-221-1/+1
* Merge remote-tracking branch 'origin/stable' into devv5.3.0-rc1v5.3.0-beta1v5.3.0-alpha1v5.3.0Sergio Ahumada2014-02-101-1/+1
|\
| * tst_qtgraphicaleffects: make the test work on devicesold/5.2Sergio Ahumada2014-02-061-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-171-1/+1
|\|
| * Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| * qdocconf: Remove nonexistent dependencySze Howe Koh2014-01-151-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-290-0/+0
|\|
| * Bump MODULE_VERSION to 5.2.1v5.2.1Sergio Ahumada2013-11-251-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-201-5/+4
|\|
| * Avoid out-of-bounds accessGunnar Sletta2013-11-141-5/+4
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0825-1/+81
|\|
| * Document recursion limitations of the graphical effects.v5.2.0-rc1v5.2.0Gunnar Sletta2013-11-0724-0/+80
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
* | Bump qtgraphicaleffects version to 5.3.0Sergio Ahumada2013-09-251-1/+1
|/
* Remove unnecessary dependency to qtjsbackend from sync.profilev5.2.0-beta1v5.2.0-alpha1Simon Hausmann2013-08-131-1/+0
* Merge branch 'stable' into devSergio Ahumada2013-08-052-3/+30
|\
| * Merge remote-tracking branch 'origin/release' into stableold/5.1Sergio Ahumada2013-07-261-0/+25
| |\
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| * | Fix compilation of pngdumper.Friedemann Kleint2013-07-261-3/+5
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-232-2/+2
|\|
| * Fix domain in pngdumper.Friedemann Kleint2013-07-192-2/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-0/+2
|\|
| * Mark internal properties in FastBlur documentation.Mitch Curtis2013-07-081-0/+2
* | Doc: Setting navigation variables for the navigation barJerome Pasion2013-06-261-1/+4
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-4/+5
|\|
| * Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| * sync.profile: Point dependencies to an empty stringv5.1.0-rc2v5.1.0-rc1v5.1.0Sergio Ahumada2013-05-261-4/+5
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-236-0/+1704
|\|
| * Add changes-5.1.0 fileSergio Ahumada2013-05-131-0/+22
| * Add license files mandated by (L)GPL.v5.1.0-beta1Timo Jyrinki2013-04-104-0/+1660
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+22
| |\
| | * Add changes-5.0.2 filev5.0.2Sergio Ahumada2013-03-201-0/+22
* | | Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-271-0/+2
|\| |
| * | 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