summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1Sergio Ahumada2013-09-061-0/+22
|\
| * Merge remote-tracking branch 'origin/release' into stableold/5.1Sergio Ahumada2013-08-161-0/+22
| |\
| | * Add "dummy" changes file for 5.1.1v5.1.1Simon Hausmann2013-08-161-0/+22
* | | Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-131-1/+0
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-121-0/+0
|\| |
| * | Remove wrong executable flag from formextractor/form.htmlDmitry Shachnev2013-08-051-0/+0
* | | Merge branch 'stable' into devSergio Ahumada2013-08-050-0/+0
|\| |
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-1/+1
|\|
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-07-041-1/+1
| |\
| | * Only build QML examples if the QtQuick module is availablev5.1.0-rc2v5.1.0-rc1v5.1.0Andras Becsi2013-06-041-1/+1
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-044-11/+8
|\| |
| * | Silence compiler warnings in browser example.Friedemann Kleint2013-07-034-11/+8
* | | Doc: Setting navigation variables.Jerome Pasion2013-06-271-0/+2
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-1210-49/+41
|\| |
| * | Fix the html output of the QObjectXmlModel example.Michael BrĂ¼ning2013-06-031-1/+1
| * | Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-301-1/+1
| |/
| * sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-261-8/+9
| * Add changes-5.1.0 fileSergio Ahumada2013-05-141-0/+22
| * QML Examples: Remove .qmlproject filesv5.1.0-beta1Kai Koehne2013-05-072-32/+0
| * Fix typo in docsKai Koehne2013-05-071-1/+1
| * Rename QtWebKit Examples and Demos -> QtWebKit ExamplesSergio Ahumada2013-05-032-3/+3
| * adjust to module renameOswald Buddenhagen2013-04-301-0/+0
| * use qt_parts.prfOswald Buddenhagen2013-04-261-2/+3
* | Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-277-11/+42
|\|
| * Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| * Fix the build of the QML examples if C++11 is enabledAndras Becsi2013-03-251-1/+1
| * The QT_NO_PRINTER guard is too generic if QPrintDialog is disabledAndras Becsi2013-03-251-2/+2
| * Merge "Merge branch 'dev' into stable" into refs/staging/stableSergio Ahumada2013-03-241-3/+0
| |\
| | * Merge branch 'dev' into stableSergio Ahumada2013-03-191-3/+0
| | |\ | |_|/ |/| |
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-2511-21/+48
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-6/+6
|\ \ \
* \ \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-052-31/+2
|\ \ \ \
* | | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-281-3/+0
* | | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17239-261/+1808
|\ \ \ \ \
* | | | | | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-131-8/+8
| | | | | * Namespace jQuery to avoid potentional conflictsJonathan Liu2013-03-241-7/+8
| | | | | * Merge remote-tracking branch 'origin/release' into stableOswald Buddenhagen2013-03-224-1/+31
| | | | |/|
| | | | | * build with -no-widgetsv5.0.2Oswald Buddenhagen2013-03-221-1/+2
| | | | | * disable the module when webkit is missingOswald Buddenhagen2013-03-221-0/+2
| | | | | * Add changes-5.0.2 fileSergio Ahumada2013-03-201-0/+25
| | | | | * define MODULE_VERSIONOswald Buddenhagen2013-02-281-0/+2
| | | | | * Merge branch 'stable' into releaseJohanna Aijala2013-02-2112-27/+54
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | Package resources for webkit qml examples in resource files.Michael BrĂ¼ning2013-02-1911-21/+48
| | | |/ /
| | | * / substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-6/+6
| | |/ /
| | * / Merge branch 'release' into stableSergio Ahumada2013-01-312-31/+2
| |/| | | | |/
| | * Update changes file for 5.0.1 releasev5.0.1Sergio Ahumada2013-01-211-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-09128-130/+184
| | |\ | | |/ | |/|