summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-072-2/+0
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-261-1/+2
|\
| * Fix crash when creating a QScriptEngine in a native threadAndy Shaw2014-06-211-1/+2
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-06-022-5/+6
|\ \ | |/
| * Fix compilation under precompiled headers: define _CRT_RAND_Sv5.3.1stable5.3.1Thiago Macieira2014-06-021-0/+2
| * Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-241-1/+1
| * qtscript: Check for QtGui before building the examplesVicente Olivert Riera2014-04-171-5/+4
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-242-1/+3
|\ \ | |/
| * Fix recursive calling of QScriptProgramv5.3.0-rc1v5.3.0-beta1v5.3.0release5.3.0Lars Knoll2014-03-112-1/+3
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-114-14/+19
|\ \ | |/
| * Fix build on x32Allan Sandfeld Jensen2014-03-041-1/+11
| * Android: fix compileBogDan Vatra2014-03-041-8/+1
| * Fix some typosSergio Ahumada2014-03-042-5/+5
| * Don't pretend to be PLATFORM(IPHONE) or PLATFORM(IPHONE_SIMULATOR)Tor Arne Vestbø2014-02-271-0/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-241-1/+1
|\ \ | |/
| * the qsdbg example needs no QtGuiv5.3.0-alpha1Oswald Buddenhagen2014-02-201-1/+1
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/
* Replace win32-g++ with mingw scopeKai Koehne2014-02-071-1/+1
* Exclude WinRT from buildMaurice Kalinowski2014-02-051-0/+2
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Simon Hausmann2014-02-050-0/+0
|\
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-170-0/+0
| |\
| | * Bump MODULE_VERSION to 5.2.2old/5.2Sergio Ahumada2014-01-161-1/+1
* | | Mark qscriptjstestsuite as insignificant on Windows.Friedemann Kleint2014-02-051-0/+1
|/ /
* | Detect AArch64 architectureRiku Voipio2014-01-081-1/+9
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-051-1/+7
|\ \ | |/
| * JavaScriptCore: c++11 compile fixv5.2.1Tim Blechmann2013-12-051-1/+7
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-297-12/+24
|\ \ | |/
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-267-12/+24
| |\
| | * Fix compiler errors.v5.2.0-rc1v5.2.0Erik Verbruggen2013-11-187-12/+24
| * | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| |/
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-086-5/+27
|\ \ | |/
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-062-0/+2
| * use private linkage where possibleOswald Buddenhagen2013-11-012-2/+2
| * Fix JavaScriptCore ftbfs on mips64(el)YunQiang Su2013-11-011-1/+21
| * Fix compilation of Qt Script with MSVC 2013.Friedemann Kleint2013-10-241-2/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-241-1/+1
|\ \ | |/
| * Fix tab-completion for variables that have digits in themAndy Shaw2013-10-221-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-1118-26/+37
|\ \ | |/
| * WS fix in qscriptcontext.cppv5.2.0-beta1Jerome Pasion2013-10-081-1/+1
| * Doc: Adding "\inmodule QtScript" to Qt Script classes.Jerome Pasion2013-10-0812-9/+13
| * Autotest: Fix unexpected rounding of floating point in date testsThiago Macieira2013-09-281-2/+2
| * Revert "Skip failing qscriptengine tests on Windows."Thiago Macieira2013-09-281-6/+0
| * Remove QtAlgorithms usage from QtScript.Friedemann Kleint2013-09-266-8/+21
* | Bump qtscript version to 5.3.0Thiago Macieira2013-09-241-1/+1
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-241-0/+8
|\ \ | |/
| * 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