summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix recursive calling of QScriptProgramv5.3.0-rc1v5.3.0-beta1v5.3.0release5.3.0Lars Knoll2014-03-112-1/+3
| | | | | | | | | | | | The first time a QScriptProgram is evaluated, it gets compiled and then executed. If the execution would somehow trigger another evaluation of the script program, it would run into the compile stage again (even though it already was compiled), and then trigger and assertion in debug mode (or leak memory in release builds). Task-number: QTBUG-37317 Change-Id: I83e7efd5f238d021e200258826e2e4a9520c3a7d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix build on x32Allan Sandfeld Jensen2014-03-041-1/+11
| | | | | | | | | | Recognize x32 and disable JIT in this configuration. Task-number: QTBUG-35463 Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e Reviewed-by: Gregory Hinton Nietsky <gregory@distrotech.co.za> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Android: fix compileBogDan Vatra2014-03-041-8/+1
| | | | | | | | | In early NDKs (previous to 9) Elf32_auxv_t struct was not defined at all. In NDK 9+ Elf32_auxv_t struct is already defined in elf.h and we'll get an error. We need to include asm/procinfo.h for HWCAP_VFP. Change-Id: I1ba30991ea9dd14ad9d7273c58ed6e61cd75255e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix some typosSergio Ahumada2014-03-042-5/+5
| | | | | Change-Id: Idb1e503afa74efe167d68e6fb993f50138546c51 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Don't pretend to be PLATFORM(IPHONE) or PLATFORM(IPHONE_SIMULATOR)Tor Arne Vestbø2014-02-271-0/+2
| | | | | | | As that ends up triggering other code paths such as JIT on ARM. Change-Id: I14238c0913bd60e07de5015a82bcde0ab08a3a19 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* the qsdbg example needs no QtGuiv5.3.0-alpha1Oswald Buddenhagen2014-02-201-1/+1
| | | | | | Task-number: QTBUG-36893 Change-Id: I4199df78e037c3959fd7d745d89b59d667010b73 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Replace win32-g++ with mingw scopeKai Koehne2014-02-071-1/+1
| | | | | | | | | | Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: If232fdbaacc9ce6a16c269b4c06b81efa196c2d8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Exclude WinRT from buildMaurice Kalinowski2014-02-051-0/+2
| | | | | | | Change-Id: I36de2011fa78c57e18f5e43b06e2f0ecca1b8f6c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2014-02-050-0/+0
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-170-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I312f9535c2b4937f0575dec6491f0d73f2726b28
| | * Bump MODULE_VERSION to 5.2.2old/5.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I596c9b720a17a171202d53fdff33445bcb0b46dc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | Mark qscriptjstestsuite as insignificant on Windows.Friedemann Kleint2014-02-051-0/+1
|/ / | | | | | | | | | | | | Task-number: QTBUG-36632 Change-Id: Ida2f4665b25f5343e5abe73b135798ff3546d4d6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Detect AArch64 architectureRiku Voipio2014-01-081-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds WTF platform support for the AArch64 architecture. Patch is based on WebKit-gtk patch done by Riku Voipio, and was cherry-picked and tested by Marcin Juszkiewicz. Task-number: QTBUG-35442 Change-Id: Ie6194f3c430cb6513367a3cdf221a41d60a1ed14 Signed-off-by: Riku Voipio <riku.voipio@iki.fi> Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-051-1/+7
|\ \ | |/ | | | | Change-Id: I6498ca9158162e2c2b9db6867128ba4ae687f5f9
| * JavaScriptCore: c++11 compile fixv5.2.1Tim Blechmann2013-12-051-1/+7
| | | | | | | | | | | | Change-Id: I0de4140323db25765243748dfed8533bca39217c Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-297-12/+24
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie63ca45ad8e2c57ad27c7b693f268ce5c4cc18f4
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-267-12/+24
| |\ | | | | | | | | | Change-Id: I473774c5e7a62c2aa8541d22327366364ad70553
| | * Fix compiler errors.v5.2.0-rc1v5.2.0Erik Verbruggen2013-11-187-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mavericks with Apple's Clang 5.0 (3.3 based): ../3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h:320:117: error: non-const reference cannot bind to bit-field 'm_attributesInPrevious' ...add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), existingTransition->m_attributesInPrevious), exi... ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++11 specific: ../3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h:179:35: error: non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long') to 'uint32_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] LineInfo info = { instructions().size(), n->lineNo() }; ^~~~~~~~~~~~~~~~~~~~~ Both occur in multiple places. Task-number: QTBUG-34842 Change-Id: I98a29b51718a6e0db8749ac1b495e071e9fe479d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| |/ | | | | | | | | | | Change-Id: I7129dbbb914ca981017375004a1da7b102640dde Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-086-5/+27
|\ \ | |/ | | | | Change-Id: I1f7bde2c0f17d6cdb2914ef2b3aff271ad584321
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I77ed98ade58cdd4c6f5c365682993f1be3f3e958 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * use private linkage where possibleOswald Buddenhagen2013-11-012-2/+2
| | | | | | | | | | Change-Id: I3c0a1ae83615120f9a0cf8202d4facf915decde2 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Fix JavaScriptCore ftbfs on mips64(el)YunQiang Su2013-11-011-1/+21
| | | | | | | | | | | | Task-number: QTBUG-33187 Change-Id: Iaebca6f5095e16c0316549c8a548cfc0a447faf3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix compilation of Qt Script with MSVC 2013.Friedemann Kleint2013-10-241-2/+2
| | | | | | | | | | | | | | | | Starting with MSVC 2013, more functions are provided. Change-Id: Iabbc9a94e7ed01584baaa1bb17c06e41ac70830f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-241-1/+1
|\ \ | |/ | | | | Change-Id: I5b59732e2ff9df6bd674fd0e3fba058d0e5d51f9
| * Fix tab-completion for variables that have digits in themAndy Shaw2013-10-221-1/+1
| | | | | | | | | | | | | | | | | | In the QtScript Debugger if a variable had a number in it then it would not tab complete to show the member variables. This accounts for digits so that it is correctly able to find the variable to complete on. Change-Id: I4fe0b3b776aba0e3caa6dd524c1a0c59421ea515 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-1118-26/+37
|\ \ | |/ | | | | Change-Id: Iffa749d9e01fe4fd178a60a3debeae06a7693c4c
| * WS fix in qscriptcontext.cppv5.2.0-beta1Jerome Pasion2013-10-081-1/+1
| | | | | | | | | | | | | | -produced by git-split-ws Change-Id: I1661678174c62971a7bbf4acb2890fdf590d2f3d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Adding "\inmodule QtScript" to Qt Script classes.Jerome Pasion2013-10-0812-9/+13
| | | | | | | | | | | | | | | | -reduces QDoc warnings -lists the classes in the C++ pages Change-Id: I97db6b8bec4d44d1ee37ed2925ef7309cd0d420f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Autotest: Fix unexpected rounding of floating point in date testsThiago Macieira2013-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | QString("new Date(%0)").arg(1380318500 * 1000.0) expands to "new Date(1.38032e+12)". That's an unnecessary rounding and cuts off interesting bits out of the date. It took me quite a while debugging QScriptEngine trying to find out why the time_t and the JS Date internal numbers were different. Change-Id: Id880f3f11edd0af07e1726eac0242d4a9625c368 Reviewed-by: John Layt <jlayt@kde.org>
| * Revert "Skip failing qscriptengine tests on Windows."Thiago Macieira2013-09-281-6/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit eff4a0f3fca2e22d4be888cdd7953e1c2ab8c918. That commit disabled a test that had a legitimate failure, caused by a QDateTime regression. Said regression was fixed by qtbase commit 475cbed2446d0e3595e7b8ab71dcbc1ae5f59bcf. Change-Id: I1212dc8414d5a0d8d87bbe2e2a667475fd30414c Reviewed-by: John Layt <jlayt@kde.org>
| * Remove QtAlgorithms usage from QtScript.Friedemann Kleint2013-09-266-8/+21
| | | | | | | | | | | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: If4dc8f69fd75315390a4850be732715064f5fdd8 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Bump qtscript version to 5.3.0Thiago Macieira2013-09-241-1/+1
| | | | | | | | | | Change-Id: I8e11b25e902e1d39e1f3f504c6e86a98d86304b6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-241-0/+8
|\ \ | |/ | | | | Change-Id: I9d56563ae7af982f81f21d9d5b1a48d8be8a09cb
| * Skip failing qscriptengine tests on Windows.v5.2.0-alpha1Mitch Curtis2013-09-241-0/+6
| | | | | | | | | | | | | | Task-number: QTBUG-33622 Change-Id: Id719eadf3caa5ed34850ae189652f26eed7a6aea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Revert "Don't remove milliseconds now that toString() includes them."Mitch Curtis2013-09-241-0/+2
|/ | | | | | | | | This reverts commit 37ec5822522baaa5b6e316103477d6da7e6d6a9c, as 15da0a5af20fe6771bcb94ef8d46edbd5c8fb64c was also reverted with: https://codereview.qt-project.org/#change,65560 Change-Id: I73bd91e3ac97384db27107051faead7a8cad3d91 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-132-1/+15
|\ | | | | | | Change-Id: Ia10bb1e8b5fa8bb93e76bf2e295df5c10336e582
| * EXPECT_FAIL tests for MSVC 64 bit in qscriptjstestsuite.old/5.1Friedemann Kleint2013-09-122-1/+15
| | | | | | | | | | | | | | | | | | | | Introduce compiler defines for 32/64 bit and adapt the text file. Task-number: QTBUG-32829 Change-Id: I9cdbe5b306264858953e2c710b48300f5690e7db Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-0/+2
|\ \ | |/ | | | | Change-Id: I8352e99c9886882115b5808e6903ce09645949ba
| * exclude WebKit/JavaScriptCore from lupdate scanOswald Buddenhagen2013-09-021-0/+2
| | | | | | | | | | | | | | | | there is no point in scanning it, and it's incredibly slow. Change-Id: Ife2fe879b8285f18bb714804c532a68ed64f84d8 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | QtScript: Fix header guardTobias Hunger2013-08-291-1/+1
| | | | | | | | | | Change-Id: Ib8db978f3f5414fccfcf772f7fa9b2b7ddbc761c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-271-2/+0
|\ \ | |/ | | | | Change-Id: I98df818f6411c38a6ad8a8efaf6b6a0203dbb958
| * test: Fix XPASS for tst_QScriptJsTestSuite::ecma/Math(Math.pow()Sergio Ahumada2013-08-201-2/+0
| | | | | | | | | | | | | | | | This tests seem to be passing on MinGW 4.8, so removing them from the expect_fail.txt file. Change-Id: I3786d410f1e0937ddc1ceedd8ffd3c07d2619c40 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-121-0/+25
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ieba84e0e32cc81d328bd5178caecb5005b62ab81
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+25
| |\ | | | | | | | | | Change-Id: I025901e52747805c61dc7edd40d5f2d067291bd0
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | | | | | | | | | Change-Id: I256a0624ba33c55bba2a400df42cd8ef66fc7394 Reviewed-by: Wouter Huysentruit <wouter.huysentruit@dzine.be> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-231-1/+1
| |/ | | | | | | | | Change-Id: I6f3686ed8b527004af33f4ef62bf835220f5a7a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-022-1/+2
| | | | | | | | | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: I018b00a19c3bbd2aa4bf34712f414569dd50775b Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-114-10/+7161
|\ \ | |/ | | | | Change-Id: I4231685b78a7886928efe191aa7f09bb8a50e81e
| * Remove references to obsolete QSA-product.Friedemann Kleint2013-07-112-10/+0
| | | | | | | | | | Change-Id: I2a89644fa7440b0ef113d956affd745716607aee Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
View Lorry Controller Status