summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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/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>
* 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>
* 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>
* 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>
* 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>
| * test: Add 5.1.0 bic data for linux-gcc-ia32Sergio Ahumada2013-07-082-0/+7161
| | | | | | | | | | Change-Id: I6d17ba2357350199bb0f0043cc0cc741df6785b4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Doc: Setting navigation variables for Qt Script and Qt Script ToolsJerome Pasion2013-06-262-2/+8
| | | | | | | | | | | | | | -also enabled linking to 'qtdoc' for the homepage link Change-Id: I74781effabac4c73c8a286347e5aa0821d5931f0 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-121-16/+2
|\ \ | |/ | | | | Change-Id: Id041591bce92162e8c615034c24c56199064e76d
| * Bring in WebKit revisions 139553 and 139921.Raphael Kubo da Costa2013-06-111-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are primarily useful for getting rid of some libstdc++-specific includes which break the build with libc++, and also for simplifying the code and removing a Darwin-specific code path. r139553 by ossy@webkit.org: Use sync_add_and_fetch instead of gnu_cxx::exchange_and_add https://bugs.webkit.org/show_bug.cgi?id=106729 After r139514 we need atomicIncrement(int64_t volatile*) for all platform. Now the GCC implementation of atomicIncrement() is based on gnu_cxx::exchange_and_add, which doesn't support int64_t type, but sync_add_and_fetch does. Reviewed by Benjamin Poulain. r139921 by benjamin@webkit.org: Use GCC's implementation of atomicIncrement/Decrement on Mac https://bugs.webkit.org/show_bug.cgi?id=106976 Reviewed by Filip Pizlo. wtf/Atomics.h: GCC and LLVM have builtin for atomic ADD and SUB: sync_add_and_fetch, sync_sub_and_fetch. Using them let the compiler just generate the atomic operations inline instead of generating a function call to LibC. It also simplify the code a bit. Change-Id: Ic85cc1cc436477c63d2ebaf4f9ee2dfe7c05839f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-062-2/+2
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-042-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I0c7564e03a51df9aba7dd53640802e318417bd0e
| | * Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| | | | | | | | | | | | | | | Change-Id: Ie9a9cd6a4b4f7f4735ff65f47c754b4609e1a1da Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * sync.profile: Point dependencies to an empty stringv5.1.0-rc2v5.1.0-rc1v5.1.0Sergio Ahumada2013-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: Id206bb81aa4bd719ac8818b98103238deb05435d Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | * Doc: Removed landing page from "technology-apis" group.Jerome Pasion2013-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | The group in qtdoc was replaced by the new overviews in qtdoc. Change-Id: I55518f8cf581a4de394863e359a3a848fc9842b0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Don't remove milliseconds now that toString() includes them.Mitch Curtis2013-06-051-2/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a test failure introduced by 15da0a5af20fe6771bcb94ef8d46edbd5c8fb64c. tst_QScriptEngine::dateConversionJSQt and tst_QScriptEngine::dateConversionQtJS removed milliseconds from the JS-converted datetime, as QTime::toString() previously did not include them. Now it does, so we can remove this code. Change-Id: Iaddfc050adf8360bee776086b27de001702d221d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-232-3/+25
|\ \ | |/ | | | | Change-Id: I1609a9761c9942f3f702c6cb963d338674344ca5
| * Add changes-5.1.0 fileSergio Ahumada2013-05-131-0/+22
| | | | | | | | | | Change-Id: I8ec20645dc51247cb669679a233a9d53513e9e37 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Fix compilation on ARMv5.1.0-beta1Samuli Piippo2013-05-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | Android fix broke ARM compilation on non-Android Linux platforms. Now correcly define Elf32_auxv_t only on Android/Qt and otherwise include asm/hwcap.h Task-number: QTBUG-30978 Change-Id: I6708acd876d14b869a93a36f7d969e10febbd38b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-296-24/+730
|\ \ | |/ | | | | Change-Id: I9e5ddd0fa7d872c414a8b3010681eaf0e0e16640
| * Bring in WebKit r74029 to fix the build with clang.Raphael Kubo da Costa2013-04-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ------------------------------------------------------------------------ r74029 | cwzwarich@webkit.org | 2010-12-14 18:57:14 +0200 (Tue, 14 Dec 2010) | 12 lines Reviewed by Eric Seidel. Clang fails to build the JSC interpreter https://bugs.webkit.org/show_bug.cgi?id=51016 Clang does not allow indirect gotos out of scopes with cleanup. GCC 4.2 allows them, but it does not correctly generate the cleanup, causing a leak if the cleanup decrements a reference count. * interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute): Put an Identifier into its own scope. ------------------------------------------------------------------------ Change-Id: Ied16d38431715ef8f1ad9e7d1fae0921500b0ffd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Doc: Fix module names in .qdocconfTopi Reinio2013-04-262-22/+22
| | | | | | | | | | | | | | | | | | Use CamelCase for module name(s) used in in .qdocconf - this is required as qdoc will generate visible output (tags in example manifest files) based on these names. Change-Id: If9f79e73d823270d8ecb652d1b7b9d9d44f9562e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix qtscript build for WEC7 by bringing ce-compat back to Qt5 .Janne Anttila2013-04-243-0/+704
| | | | | | | | | | | | | | | | | | | | | | | | | | | | JSCore build for WEC7 depends on ce-compat, and apparently it was vanished as a part of Qt modularization or some other cleanup. Copied relevant files and pro file lines form Qt4 back to QtScript repo under 3rdparty folder. Change-Id: Ic710be105df17b44962553ae3b61401b2dd6fab5 Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-04-113-2/+28
|\ \ | |/ | | | | Change-Id: I5d118c809890a7179791085b7514434e339bd7c6
| * List QtScriptTools as a module under test.Stephen Kelly2013-04-081-0/+1
| | | | | | | | | | | | | | So that the expected version for it is generated. Change-Id: If414029e6cb420b33e5f36baf31ec5ef37c5c491 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
View Lorry Controller Status