summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * test: Add 5.1.0 bic data for linux-gcc-ia32Sergio Ahumada2013-07-082-0/+7161
* | Doc: Setting navigation variables for Qt Script and Qt Script ToolsJerome Pasion2013-06-262-2/+8
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-121-16/+2
|\ \ | |/
| * Bring in WebKit revisions 139553 and 139921.Raphael Kubo da Costa2013-06-111-16/+2
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2013-06-062-2/+2
|\ \
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-042-2/+2
| |\ \ | | |/
| | * 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-251-1/+2
| | * Doc: Removed landing page from "technology-apis" group.Jerome Pasion2013-05-241-1/+0
* | | Don't remove milliseconds now that toString() includes them.Mitch Curtis2013-06-051-2/+0
|/ /
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-232-3/+25
|\ \ | |/
| * Add changes-5.1.0 fileSergio Ahumada2013-05-131-0/+22
| * Fix compilation on ARMv5.1.0-beta1Samuli Piippo2013-05-061-3/+3
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-296-24/+730
|\ \ | |/
| * Bring in WebKit r74029 to fix the build with clang.Raphael Kubo da Costa2013-04-291-2/+4
| * Doc: Fix module names in .qdocconfTopi Reinio2013-04-262-22/+22
| * Fix qtscript build for WEC7 by bringing ce-compat back to Qt5 .Janne Anttila2013-04-243-0/+704
* | Merge branch 'stable' into devSergio Ahumada2013-04-113-2/+28
|\ \ | |/
| * List QtScriptTools as a module under test.Stephen Kelly2013-04-081-0/+1
| * 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
| | | |/ /