summaryrefslogtreecommitdiff
path: root/src/3rdparty/javascriptcore
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation under precompiled headers: define _CRT_RAND_Sv5.3.1stable5.3.1Thiago Macieira2014-06-021-0/+2
| | | | | | | | | | | | | | | | | If the macro _CRT_RAND_S is defined, #include <stdlib.h> will define the rand_s function. All was well before the precompiled headers because wtf/config.h was always the first header included in WTF and it #defined at the right place. With precompiled headers, stdlib.h got included from qglobal.h before the #define took place. This was a latent bug because the non-JSC parts of QtScript could have included RandomNumberSeed.h and caused the error. RandomNumberSeed.h(82) : error C3861: 'rand_s': identifier not found Change-Id: I88b4b8670604b35ca694c02522324ac3083ed2b4 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix recursive calling of QScriptProgramv5.3.0-rc1v5.3.0-beta1v5.3.0release5.3.0Lars Knoll2014-03-111-0/+2
| | | | | | | | | | | | 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* use private linkage where possibleOswald Buddenhagen2013-11-011-1/+1
| | | | | 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>
* 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>
* 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>
* 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>
* Fix qtscript build for WEC7 by bringing ce-compat back to Qt5 .Janne Anttila2013-04-241-0/+2
| | | | | | | | | | | | | | 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>
* Fix compile on AndroidBogDan Vatra2013-04-023-7/+20
| | | | | Change-Id: Ide8d4a50169de13e9743f3b2304af2b23c3ce694 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-074-5/+5
|\ | | | | | | refs/staging/dev
| * Doc: Fix module name formatSze Howe Koh2013-01-264-5/+5
| | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtScript -> Qt Script QtScriptTools -> Qt Script Tools Change-Id: Icf6b2ea3829247475f8902334b615f9a9206cc51 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix compile error caused by min/max defines.Friedemann Kleint2013-02-051-4/+4
|/ | | | | | | | qtbase d0804ff2dd3d289a0f0c58aa30c4334e66ea9be0 introduces a check for min/max which causes a compile error. Change-Id: I6a79e75423baa3f577eb26697e2766e58040b7d9 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add a means to specify that the VM_POOL_SIZE can be 1gb and not 2gbAndy Shaw2013-01-141-0/+4
| | | | | | | | | | | Due to a reported problem where the reserving of 2gb was too big under certain circumstances then in order to provide a means for people who hit this problem a define is added so that the VM_POOL_SIZE is set to be 1gb instead. This is an optional define and the default is for the size to be 2gb which keeps it to current behavior. Change-Id: I73200e1bcfcf7b37c6ba62f8b7bcf217f239dfcb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-108-8/+8
| | | | | | Change-Id: Ic4a2739c8caf2eac95e4a72d8d38cfb912d5fe2b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix Math.pow implementation with MinGW-w64Jonathan Liu2013-01-091-7/+23
| | | | | | | Adapted from WebKit changes 137895, 138705, 138894 and 138903. Change-Id: I166f8837e898d17d71ce4e4cab8ab45ea49de39c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* remove obsolete DEPENDPATH assignmentsv5.0.0Oswald Buddenhagen2012-12-162-2/+0
| | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I0804385b636d6f5b3b0136cc472a1f9ecb7b7871 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove unnecessary CONFIG additionOswald Buddenhagen2012-12-161-2/+0
| | | | | | | depend_includepath is already added by default_pre.prf. Change-Id: I92aa1f2d1408e4d7cdbfa8c3b24aaaba6c8b4810 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* purge ce-compat referencesOswald Buddenhagen2012-12-123-2/+28
| | | | | | | | adapted from WebKit changes 125004 & 125018. Change-Id: Id051375924ece634acf2c0564a39c2d4b1cebe3c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-12-058-8/+8
| | | | | Change-Id: I70a3156710a37b02417c7d6c7c6c1ee222da0281 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* remove symbian vestigesOswald Buddenhagen2012-12-042-17/+3
| | | | | Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix mmap usage.Jędrzej Nowacki2012-10-221-2/+2
| | | | | | | | | | Add missing MAP_NORESERVE, and fix error checking. Special thanks to Olivier JG for debugging the issue. Task-number: QTBUG-27322 Change-Id: Ic4d5aa5849b9b5500fd3065aad5c86dd089a850b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix MinGW-w64 compilationJonathan Liu2012-09-041-1/+1
| | | | | | | | | | ENABLE_EXECUTABLE_ALLOCATOR_FIXED requires sys/mman.h which is not available with MinGW-w64. Change-Id: I6e76ce0c570e5819657debf813f0e80cef907dd4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Make QScriptEngine::uncaughtExceptionBacktrace() work againKent Hansen2012-08-152-0/+3
| | | | | | | | | | | This function has been broken since Qt 4.6 (when the JavaScriptCore- based back-end was introduced). Fix it by introducing a callback in JSC that allows us to capture the stack when an uncaught exception occurs. Task-number: QTBUG-6139 Change-Id: I4a829323c9fb0c8b2f16a2e5d6f0aeb13cc32561 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Suppress JavaScriptCore 'LEAK' messages at application exitKent Hansen2012-08-131-0/+2
| | | | | | | | | | | | | | | | | | In debug mode, if a QScriptEngine was never destroyed, JavaScriptCore would output a message like LEAK: 120 Structure on stderr at exit. This is not terribly helpful to users; also, it's not common for Qt classes to produce such output. Since JavaScriptCore's only usage of the logging facility is for reporting these "leaks", we can disable logging altogether. Task-number: QTBUG-18201 Change-Id: Id598bd1f48129d821a954cc49d8e3ab715d78426 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)Kent Hansen2012-08-068-39/+84
| | | | | | | | | Cherry-picked from webkit commit a5b3261a8c4386b4e14ce40a34c7fc933a5f7001 Task-number: QTBUG-23871 Change-Id: Ia028fe072b349e3a7883ae0f6f7298941cc1bc9e Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Check that property descriptor members are valid before using themKent Hansen2012-07-121-2/+2
| | | | | | | | | | | | | | | | | Even if getPropertyDescriptor() returns true, it's not guaranteed that PropertyDescriptor::setter() or PropertyDescriptor::value() returns a valid JSC value. This code is in an "#ifdef QT_BUILD_SCRIPT_LIB" block, i.e. a patch we added on top of the original JSC sources. The lack of checks caused the getter-in-prototype and indexed-accessors tests from the V8 test suite to assert in debug mode. Task-number: QTBUG-17915 Change-Id: I568d83f2f80b28871ea0d934a8e33078ac8aa3ad Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Ensure QObject wrappers are garbage-collected if appropriateKent Hansen2012-07-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address the "###" comment. When QScriptEngine::newQObject() is called with the option PreferExistingWrapperObject, the resulting wrapper object is cached by the engine, in case it will be needed later (e.g., by a subsequent newQObject() call for the same QObject, with the same wrap options). But if a QObject wrapper object is only referenced by the QtScript internals (i.e., not reachable from the JSC stack/heap, or kept in a QScriptValue), the wrapper should not be kept alive if the ownership is ScriptOwnership, or if the ownership is AutoOwnership and the C++ object has no parent. If the wrapper is marked in that case, it won't get collected, and hence the C++ object will be kept alive, too. In practice, QtScript appears to leak memory (the objects will only be destroyed when the engine is destroyed). Our copy of JSC doesn't have a concept of weak references; the ClientData callback in the JSC markRoots() function (which causes QScriptEnginePrivate::mark() to be called) was moved to the end. This enables the wrapper and connection marking logic to determine whether a wrapper can be safely discarded (if it hasn't been marked by JSC by this point, it must be a weak reference). Task-number: QTBUG-21993 Change-Id: I61f6aafc91f080b80d3f5859148e645b80d9b653 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Compile with clang's libc++Bradley T. Hughes2012-06-232-2/+4
| | | | | | | | | | | | | | An overload for std::swap() what works with std::pair<A,B> is included in libc++ (but not libstdc++). Avoid ambiguity in HashTable.h by omitting the version there and using the std::swap() version. Collector.cpp needs to include pthread.h directly, as it is not automatically included by libc++'s headers (libstdc++ does pull in pthread.h though). Change-Id: I20ffe5a745900d1cfa1e489ebf4376e454eded5f Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix possible type collision with ICUKonstantin Ritt2012-06-151-1/+1
| | | | | | | | | | | see https://bugs.gentoo.org/show_bug.cgi?id=407315 The UChar32 is declared as signed 32-bit int since ICU 2.4, no chance they'll fix their code. Change-Id: I9691507c8ca14a04610e9b13ae13f416929ffa08 Reviewed-by: Davide Pesavento <davidepesa@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Skip a test case that started failing after the upgrade to Unicode 6.1Konstantin Ritt2012-06-151-141/+47
| | | | | | | | | | | U+10C1 and U+10CD has been added in the Unicode 6.1 and assigned with general category Lu (Uppercase Letter). toLower(Lu) can never be Lu, thus the failing testcases are just wrong -> omit them. This also avoids using of QUnicodeTables internals in JSC. Change-Id: I6aa6dab686dc3e3556ebe83c395c5d93e42cfb4f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* don't reference $$QT_SOURCE/BUILD_TREE - they're unavailable hereOswald Buddenhagen2012-06-061-2/+2
| | | | | Change-Id: I88316acb4cfc867689dfa636dd7554ac0976275f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed MSVC2011 buildAndreas Holzammer2012-05-165-10/+10
| | | | | | | | | | | | JavaScriptCore fix is relevant to changed ctor of the std::pair in C++11. Due to that change some code has been broken. Fix makes using std::pair compliant to both standards Change-Id: I77a1fe4b137480b51c24267b7aacb5b688dbddb3 (Partially cherry picked from commit 9a06d491e8e63293e4cc877b00f3a59188283785) Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Kervala <kervala@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Revert "JSCore build fix for WEC7"Andreas Holzammer2012-05-101-11/+0
| | | | | | | | | | | | | | | It's reverted, as there seems to be at least two implementations of the stl in WEC7. One for each BSP SDK and one shipped with the compiler, which is in this case Visual Studio 2008. The Compiler has a stl with std::min etc. Visual Studio GUI also uses the compiler version of the stl first. It seems to be that the environment was setup wrongly. Checksdk also uses the right order. This reverts commit 8b65d84145f0f415d0963caa7b49da07ac67148d. Change-Id: Ic00d87777e822d9a7c2ee16ce60cad3782293245 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* JSCore build fix for WEC7Janne Anttila2012-04-191-0/+11
| | | | | | | | | | | WEC7 does not have std::ptrdiff_t type and std::min/std::max, introduced the missing types and functions in JSCore platform.h Task-number: QTBUG-22497 Change-Id: I0bf2bff2a80bdff36253f233b30cc95e1c772e23 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> (cherry picked from commit 7f8612853273f9dc120a7bc096f10821eb48fd2b)
* WEC7 build fix - use ptrdiff_t from std namespace.Janne Anttila2012-04-191-1/+1
| | | | | | | | | | | | WEC7 does not have ptrdiff_t outside std namespace, switched to use ptrdiff_t from std namespace correspondingly as OwnArrayPtr.h does in operator[]. Task-number: QTBUG-22502 Change-Id: I5c2ffd271cccd12c1fcdca3975ace3e8224e00bf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> (cherry picked from commit 9912af2108398b8633f91300c455455f6e16e482)
* Fixes to JSCore for WinCE.Janne Anttila2012-04-191-9/+9
| | | | | | | | | | | | Moved WINCE specific code before desktop windows code. This is needed because in WinCE both OS(WINCE) and OS(WINDOWS) are true. Task-number: QTBUG-22502 Change-Id: Icf9ad1a155dc705e37e5e057bb23bc7f5c2d4931 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> (cherry picked from commit e93c5aae8366d430d69827d409f3b6d31eb5dfb6) Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
* Fix the build with gcc 4.7.Andras Becsi2012-04-122-5/+2
| | | | | | | The dependent base class of nested classes has to be fully qualified. Change-Id: If166ad3578fd65ea84899da65d2b85283dbcca9d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Fix compilation on QNX.Sean Harmer2012-02-072-2/+10
| | | | | | | | | Cherry picked commit 144de35b8c770d6698e1e6a11a37cbcc24ca4e8b from Qt 4.8 Change-Id: I6880436b54cc1c8ab6ecb64727316f422dcf5ee8 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Build fix for Windows.Friedemann Kleint2012-02-071-0/+2
| | | | | | | Deactivate min, max macros in windows.h Change-Id: Ie045b6b278fa788d55eb8a3dbefb7fab6edb5934 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-093-3/+3
| | | | | Change-Id: I323b788326712d95f6213ab8a68c18cfe28b7c76 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtScript: Fix warnings about set/unused variables.Friedemann Kleint2011-11-102-3/+0
| | | | | Change-Id: Ibee482c27341914fb4ae959e388c3376755b78df Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix typo in JavaScriptCore/runtime/Structure.cppKent Hansen2011-10-051-1/+1
| | | | | | | | | Task-number: QTBUG-20482 Change-Id: Ie982ea54f9321afbea37a9986538d905a22eca7b Reviewed-on: http://codereview.qt-project.org/6060 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
View Lorry Controller Status