summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-032-2/+27
| |\
| | * substitute fixed version numbers in qdocconf files with variablesv5.0.2Sergio Ahumada2013-03-261-2/+2
| | * Add changes-5.0.2 fileSergio Ahumada2013-03-201-0/+25
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-033-7/+20
|\ \ \ | |/ /
| * | Fix compile on AndroidBogDan Vatra2013-04-023-7/+20
* | | Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-272-3/+12
|\ \ \ | |/ /
| * | Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| * | Merge branch 'dev' into stableSergio Ahumada2013-03-1919-70/+9
| |\ \ | |/ / |/| |
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-0/+2
|\ \ \
* | | | Fix CLANG-warnings.Friedemann Kleint2013-03-083-3/+4
* | | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2013-03-083-3/+3
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-063-3/+3
| |\ \ \ \
* | | | | | Remove deprecation of QScriptContextInfo::columnNumber().Friedemann Kleint2013-03-071-3/+1
|/ / / / /
* | | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-187-11/+1661
|\ \ \ \ \
* \ \ \ \ \ Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2013-02-0736-134/+371
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-0536-134/+371
| |\ \ \ \ \ \
* | | | | | | | Fix compile error caused by min/max defines.Friedemann Kleint2013-02-051-4/+4
|/ / / / / / /
* | | | | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2815-60/+0
* | | | | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17339-102775/+7386
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-0441-237/+150
|\ \ \ \ \ \ \ \
* | | | | | | | | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-131-1/+1
| | | | | | | * | Test the cmake scripttools module only if widgets is available.Stephen Kelly2013-03-141-2/+11
| | | | | | |/ /
| | | | | | * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-121-0/+2
| | | | | | |\ \ | | | | | |/ / / | | | | | | | _
| | | | | | * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | * Merge branch 'stable' into releaseOswald Buddenhagen2013-02-20350-102884/+9145
| | | | | | |\ | | | | | |_|/ | | | | |/| |
| | | | | * | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-262-2/+2
| | | | | * | Fix a typo in QScript example.Jędrzej Nowacki2013-02-261-1/+1
| | | | |/ /
| | | | * | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-154-0/+1660
| | | | * | Remove QPointerBase bic check.Stephen Kelly2013-02-132-10/+0
| | | | * | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-1/+1
| | | |/ /
| | | * | Merge branch 'release' into stableSergio Ahumada2013-01-3115-26/+263
| | | |\ \ | | | | |/
| | | | * Fix QtScript crash on 64bit with JIT.v5.0.1Friedemann Kleint2013-01-282-4/+1
| | | | * Doc: Modularized Qt Script Tools documentation.Jerome Pasion2013-01-2413-16/+260
| | | | * Update changes file for 5.0.1 releaseSergio Ahumada2013-01-211-5/+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-0/+54
| | | | |\ | | |_|_|/ | |/| | |
| | | | * point dependencies to 'release' branchesSergio Ahumada2012-12-181-1/+1
| | | * | Doc: Fix module name formatSze Howe Koh2013-01-2623-108/+108
| | |/ /
| | * | tst_bic: Add linux-gcc-ia32 bic dataSergio Ahumada2013-01-143-1/+7034
| | * | Remove the Qt 4 BIC data for QtScript.Sergio Ahumada2013-01-1413-102442/+0
| | * | Add a means to specify that the VM_POOL_SIZE can be 1gb and not 2gbAndy Shaw2013-01-141-0/+4
| | * | Update copyright year in Digia's license headersSergio Ahumada2013-01-10313-315/+315
| | * | make use of qtHaveModule()Oswald Buddenhagen2013-01-108-10/+10
| | * | Fix Math.pow implementation with MinGW-w64Jonathan Liu2013-01-091-7/+23
| |/ /
| * | Add changes-5.0.1 fileSergio Ahumada2013-01-031-0/+51
| * | Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-201-0/+3
| |/
| * remove obsolete DEPENDPATH assignmentsv5.0.0Oswald Buddenhagen2012-12-164-4/+0
| * remove unnecessary CONFIG additionOswald Buddenhagen2012-12-161-2/+0
| * make use of qt_headersclean.prfv5.0.0-rc2Oswald Buddenhagen2012-12-122-73/+2