summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
| | | * 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