summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Skip failing qscriptengine tests on Windows.v5.2.0-alpha1Mitch Curtis2013-09-241-0/+6
* Revert "Don't remove milliseconds now that toString() includes them."Mitch Curtis2013-09-241-0/+2
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-132-1/+15
|\
| * EXPECT_FAIL tests for MSVC 64 bit in qscriptjstestsuite.old/5.1Friedemann Kleint2013-09-122-1/+15
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-0/+2
|\ \ | |/
| * exclude WebKit/JavaScriptCore from lupdate scanOswald Buddenhagen2013-09-021-0/+2
* | QtScript: Fix header guardTobias Hunger2013-08-291-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-271-2/+0
|\ \ | |/
| * test: Fix XPASS for tst_QScriptJsTestSuite::ecma/Math(Math.pow()Sergio Ahumada2013-08-201-2/+0
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-121-0/+25
|\ \ | |/
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+25
| |\
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-231-1/+1
| |/
* | Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-022-1/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-114-10/+7161
|\ \ | |/
| * Remove references to obsolete QSA-product.Friedemann Kleint2013-07-112-10/+0
| * 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
|\ \ \ \ \