summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6v5.6.0-alpha1Liang Qi2015-08-282-0/+688
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-212-0/+688
| |\
| | * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.15.5Liang Qi2015-08-190-0/+0
| | |\
| | | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
* | | | Rename uniform step->dirstep to avoid conflicts with built-inGunnar Sletta2015-08-282-6/+6
|/ / /
* | | Change the default DropShadow offset back to 0.Gunnar Sletta2015-08-172-4/+4
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-093-67/+124
|\ \ \ | |/ /
| * | Doc: rearrang tables with overflowNico Vertriest2015-07-153-67/+124
| * | Bump versionOswald Buddenhagen2015-06-291-1/+1
* | | Fix warnings in gradients.Gunnar Sletta2015-06-301-1/+2
* | | Adapt QtGraphicalEffects autotest to check for the new values.Gunnar Sletta2015-03-241-15/+11
* | | Implement MaskedBlur in terms of the new GaussianBlur.Gunnar Sletta2015-03-244-127/+86
* | | Implement Glow using the new gaussian blur.Gunnar Sletta2015-03-245-122/+82
* | | doc: fix linkageGunnar Sletta2015-03-241-3/+3
* | | Implement DropShadow using the new gaussian blur.Gunnar Sletta2015-03-247-150/+184
* | | Fix qdoc warnings in the new GaussianBlur implementation.Gunnar Sletta2015-03-131-12/+18
* | | Adapt GaussianBlur autotest to the new default values.Gunnar Sletta2015-03-131-4/+3
* | | Improve Gaussian Blur.Gunnar Sletta2015-03-136-59/+547
* | | Let sourceproxy auto-configure layers.Gunnar Sletta2015-03-102-14/+25
* | | Exclude images from the textureProvider branch.Gunnar Sletta2015-03-101-1/+1
* | | Move SourceProxy to C++ and introduce "private" module.Gunnar Sletta2015-03-1043-199/+766
* | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ /
* | Update copyright headersv5.5.0-rc1v5.5.0-beta1v5.5.0-alpha1v5.5.05.5.0Antti Kokko2015-02-17124-524/+524
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-191-1/+1
|\ \ | |/
| * Bump versionv5.4.25.4.2Oswald Buddenhagen2015-01-161-1/+1
| * Fix typo in Desaturate documentation.v5.4.15.4.1Mitch Curtis2015-01-051-1/+1
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-1725-25/+25
|\ \ | |/
| * Bump versionOswald Buddenhagen2014-12-121-1/+1
| * Remove unnecessary \inqmlmodule parameterAlejandro Exojo2014-12-0825-25/+25
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-202-3/+3
|\ \ | |/
| * Doc: Applied title case in section1 titlesv5.4.0-rc1v5.4.0-beta1v5.4.05.4.0Nico Vertriest2014-10-101-1/+1
| * Correct grammar in DropShadow's detailed description.Mitch Curtis2014-10-101-2/+2
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-097-0/+208
|\ \ | |/
| * Document DropShadow and Glow's transparentBorder properties.Mitch Curtis2014-09-306-0/+207
| * Adding designersupported to pluginsThomas Hartmann2014-09-211-0/+1
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-09-190-0/+0
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
| |\
| | * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-2815-893/+596
|\ \ \ | |/ /
| * | Update license headers and add new licensesv5.4.0-alpha1Jani Heikkinen2014-08-2415-893/+596
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ /
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\ \ | |/
| * Bump versionv5.3.25.3.2Oswald Buddenhagen2014-06-181-1/+1
* | Doc: Fix qmlclass selector used in documentation configTopi Reinio2014-06-111-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-090-0/+0
|\ \ | |/
| * Bump MODULE_VERSION to 5.3.1v5.3.1stable5.3.1Sergio Ahumada2014-04-221-1/+1
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/
* Merge remote-tracking branch 'origin/stable' into devv5.3.0-rc1v5.3.0-beta1v5.3.0-alpha1v5.3.0releasebaserock/v5.3.05.3.0Sergio Ahumada2014-02-101-1/+1
|\