summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix rare crash when calling SetExternalResourceHEADold/5.1Simon Hausmann2013-09-111-1/+3
| | | | | | | | | | | | | | | | | | This is a patch on top of the original patch that adds support for external resources to v8::Object. When the provided external resource pointer cannot be encoded in SMI, then we need to allocate an object on the heap to hold it. That in turn may trigger a garbage collection, which in turn may end up collecting the object itself. Similarly to other methods dealing with the allocation of i::Foreign, the insertion of a HandleScope is required. Done-with: Lars Task-Number: QTBUG-29127 Change-Id: I9a99998e2fbfcb8a4c1e31595344680123072c6b Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix for assert in V8 after a string is converted to a symbolDavid McFarland2013-07-311-0/+1
| | | | | | | | | | When a string is converted to a symbol by SymbolKey::AsObject, its symbol_id is undefined. Change-Id: I63c41d52e309f67a4c8fc2629bdc9fb6a18fd2b5 bug: https://bugreports.qt-project.org/browse/QTBUG-31513 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-231-1/+1
| | | | | Change-Id: I18d016b62784ec07055e1bede3a9f241306e945a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/release' into stablev5.1.1Frederik Gladhorn2013-06-280-0/+0
|\ | | | | | | Change-Id: I0f02afa89f6f97bd8685ad525315df8736731a5e
| * [V8] Fix stack alignment corruption for MinGW32 buildv5.1.0-rc2v5.1.0Peter Varga2013-06-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | BUG: https://bugreports.qt-project.org/browse/QTBUG-31396 Change-Id: If9b236f24ed82f4b6b19a2af938b422c68e5eab8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> (cherry picked from commit 91f936a862644c7ca7a1762ad05cc91d263b808e) Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Liang Qi <liang.qi@digia.com>
* | [V8] Fix stack alignment corruption for MinGW32 buildPeter Varga2013-06-251-2/+5
| | | | | | | | | | | | | | | | BUG: https://bugreports.qt-project.org/browse/QTBUG-31396 Change-Id: Ibf815ab7c1f679b01b347f7141d269a220657968 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-05-315-1/+43
|\| | | | | | | Change-Id: Ic0daef1ae2cd8d9dc9e4e1597d730a42ad00c7b1
| * Fix and test for assert/crash in v8 inlining of local functions in qml modev5.1.0-rc1David McFarland2013-05-315-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When v8 tries to inline a local function which has been flagged is_qml_global, the assert "CHECK(location_ != __null)" fails. This happens because of the early out in RecordTypeFeedback for is_qml_global. I've limited the early out to UNALLOCATED variables with is_qml_global. bug: https://bugreports.qt-project.org/browse/QTBUG-31366 Change-Id: I360ef1a05a970589159686cf3100cb70de9ae29d Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
|/ | | | | Change-Id: I6205b457518ec78566c927eb6429e0b8513c72ba Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* sync.profile: Point dependencies to an empty stringSergio 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: Ib8e54ac9066b866133641fed10edba3209a38778 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* use readelf from cross-build toolchain in hardfloat testv5.1.0-beta1Oswald Buddenhagen2013-05-071-1/+1
| | | | | | | | | it's a bit hacky that readelf is hardcoded in the first place (instead of coming from the spec), but whatever. Task-number: QTBUG-30677 Change-Id: Id3742c4a47476c8807eff3f566e45fa6d4b97326 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | Change-Id: I3650fb995af4d16c4a39c15bcf2c171f40082ddb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge branch 'dev' into stableSergio Ahumada2013-03-19639-38485/+72827
|\ | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I892bbc73c276842894a720f761ce31ad1b015672
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-0/+2
| |\ | |/ |/| | | Change-Id: Ib9047acb4fadba2a72bbb56c9b5a49ad0e7df64e
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-121-0/+2
|\ \ | | | | | | | | | Change-Id: I42a22c9dd44a1e21b5cb0cfb989594fada310a6d
| * | define MODULE_VERSIONv5.0.2Oswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I176ba81f4c038437e5c0f978ecebd8c72bd24282 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Merge branch 'stable' into releaseOswald Buddenhagen2013-02-2016-765/+1240
| |\ \ | | | | | | | | | | | | Change-Id: I22c0135ec655c7b18eeca5e26473bd0ddbbd9213
| | | * [V8] Remove unnecessary string manipulation methodsPeter Varga2013-03-124-101/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods were used in QtDeclarative but more "V8-friendly" implementations are used now. This change should be squashed into the "[V8] Add hashing and comparison methods to v8::String" commit (566a226893aaba42d7e1f5522b9d80c1cc9dc2a3) in the next V8 rebase. Change-Id: I996480619b6622060c725d88015223f28336ae64 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | * [V8][WINCE]Add WIN32 definitionAndreas Holzammer2013-03-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Windows CE compiler does not add WIN32 define, which would be needed. Change-Id: I20ce48b649939511f27d59b9df449c715bb6562b Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| | | * [V8][WINCE]Define NOMINMAX in V8 pri fileAndreas Holzammer2013-03-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to some include header orderings the NOMINMAX gets defined too late for Windows CE. So set this from compiler call. Change-Id: I755309e254e97809860484cf0543221d233d8cc2 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| | | * [V8][WINCE]Include windows headers firstAndreas Holzammer2013-03-012-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the windows headers first so that the ASSERTION macro can be overwritten of the version of V8. Change-Id: I006e75a90586ea28bf15fc0d3686585429c11975 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| | | * [V8][WINCE]Disable inline cache optimizationAndreas Holzammer2013-03-012-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable inline cache optimization because calling convention looks different. Change-Id: I719ff4860164ec6919cc5501d71c4a2b6fab110c Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | | * [V8]Port to Windows Embedded Compact 7Andreas Holzammer2013-03-0111-24/+154
| | | | | | | | | | | | | | | | | | | | Change-Id: I98524d2d6d255197f706e0aae60858dd2d0b283b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | * [V8]Implement some compiler intrinsic functionsAndreas Holzammer2013-03-011-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement CountTrailingZeros and CountLeadingZeros Change-Id: I1cb3af7cdb95c9b4f0aa4405be1b480f0c961012 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | | * [V8][WINCE] Link against the correct timer libAndreas Holzammer2013-03-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Windows CE the multimedia resist in mmtimer Library, so link against this. Change-Id: I711b5d368ca0d515c99c9e507ee64639171c79f4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com>
| | | * [V8]Undef various macros to not disturb V8Andreas Holzammer2013-03-013-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some platforms are defining symbols to something useful to them, but this breaks the V8 build. Change-Id: Ie65f2d772f8ef7b2f1b178ad67ac9d42df66a8ed Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | * [V8]Rename PrintF to FPrintF for file callsAndreas Holzammer2013-03-019-334/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the fact that Windows CE defines File to something very similar to const char *, the compiler cannot differentiate anymore between File* and const char*, so the function needs to be renamed. In the std these function also is called fprintf, so it seems to be a well known problem. Change-Id: I1d7d44a6325ec9f3de4b7496ae0a2d4ceb0512e6 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | | * Merge branch 'stable' of ssh://codereview.qt-project.org/qt/qtjsbackend into devSimon Hausmann2013-02-252-39/+33
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8/src/platform-linux.cc src/3rdparty/v8/src/platform-qnx.cc Change-Id: I1b41564f2d52481335a5d3b2a931c77f9b03c903
* | | | [V8] Cleanup hardfp ABI detection. This work was triggered by issue 2140.Sergio Martins2013-02-212-76/+65
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Upstream Patch: https://chromiumcodereview.appspot.com/10713009 Task-Number: QTBUG-28890 Change-Id: Id073388fbbffa2ad9b1cea0ab42e1d6e47862a36 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Jędrzej Nowacki2013-02-204-5/+1230
| | |\ | | | | | | | | | | | | refs/staging/dev
| | | * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-184-5/+1230
| | | |\ | |_|_|/ |/| | | | | | | Change-Id: I0734777814bd9ea61b20e4bacc22900494b516ac
* | | | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-153-0/+1210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL Change-Id: I2b283a74d28c6cc3703f3b9c7cd759d39d11dd92 Reviewed-by: Jason McDonald <macadder1@gmail.com>
* | | | [v8] Do not rely on secure API functions when using MinGW-w64Jonathan Liu2013-02-121-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows XP does not provide secure API functions in msvcrt.dll but newer versions of Windows do. Avoid using secure API functions for compatibility with msvcrt.dll on Windows XP. Upstream patches: - https://chromiumcodereview.appspot.com/12189010/ - https://chromiumcodereview.appspot.com/12210033/ Task-number: QTBUG-29306 Change-Id: I5bbd04dcb7bf46ad0246d120189b637a7d2e5422 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| | * | Comment out bogus assertEskil Abrahamsen Blomfeldt2013-02-201-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | While we haven't been able to figure out why, this assert was added recently and causes all QML apps to crash on Android ARM (expected: 16, actual: 20). We just comment it out for now to work around the crash. Change-Id: I46b450e889d63150b14a8a939b87b42322cf83e9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-053-751/+0
| | |\ | |_|/ |/| | | | | Change-Id: I81018eb28496dd624c0a23ad60d4b9764b01453f
* | | purge useless doc/global dirOswald Buddenhagen2013-02-013-751/+0
| | | | | | | | | | | | | | | | | | | | | there are no docs in this module, by design. Change-Id: Ica11311efeb2e6181922c814f55de0b4d2a5991d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Merge branch 'release' into stableSergio Ahumada2013-01-310-0/+0
|\| | | | | | | | | | | Change-Id: I998366d4282fc57df849ea2a710725d30ac294a6
| * | point dependencies to 'release' branchesv5.0.1Sergio Ahumada2012-12-181-1/+1
| | | | | | | | | | | | | | | Change-Id: If877a6e3b98dda300226e2c0bd87ebf48310f1ba Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * [v8]: Implement missing bits of the QNX platformThomas McGuire2013-01-241-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recent update of v8 added some functions that needed to be implemented, as otherwise v8 wouldn't compile anymore. Change-Id: Ic3d19f051059cb559b5cbab6d6c078df7627ea97 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-179-9/+10
| | |\ | |_|/ |/| | | | | Change-Id: I5973d2b84a0b2690b4b7f8dc37711c7dfd106180
* | | Update copyright year in Digia's license headersSergio Ahumada2013-01-108-8/+8
| | | | | | | | | | | | | | | | | | Change-Id: I96c696a2318ae4959af9d56e2c8d943e00542fa0 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | [V8] Only enable MinGW-w64 pow() workaround if neededJonathan Liu2013-01-101-1/+2
|/ / | | | | | | | | | | | | | | | | | | The pow() workaround is no longer needed in the latest version of MinGW-w64. Upstream patch: https://chromiumcodereview.appspot.com/11748033/ Change-Id: I3572a3be2e532ef1e4c728170641f772312c68b7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Add testcase for variable declaration when QML compilation mode is enabledPeter Varga2013-01-114-0/+71
| | | | | | | | | | Change-Id: I04596a40a5953cb8c93a28f10e07c3ba33dc4793 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Fix compilation after V8 updatePeter Varga2013-01-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | Add the following sources to v8.pri: * elements-kind.cc * optimizing-compiler-thread.cc * transition.cc * extensions/statistics-extension.cc Change-Id: I086c19a8a5b92967845e51e372b144875e70a927 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * [V8] QNX: Fix reserving of memoryThomas McGuire2013-01-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | ReserveRegion() did allocate all memory, instead of just reserve it. Use MAP_LAZY to only reserve, but not commit memory. MAP_NORESERVE is not available on QNX. This is now the same mechanism also used in JSC's memory allocator on QNX. Change-Id: I3cbfb26c83d13f69a37874961ad9b98a0b3bb2c7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * [V8] Compile v8.cc under C++11 mode using MinGW-w64 4.7.1Yuchen Deng2013-01-091-2/+2
| | | | | | | | | | | | | | | | | | | | error: 'random' was not declared in this scope WIN32 is not defined on C++11 mode, but _WIN32 is defined. Simply change WIN32 to _WIN32 is enough Change-Id: Id145de58bea2613c1a86f49a67303b39cb6fdd2c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * [V8] QNX: Initialize mutex in SignalSenderSean Harmer2013-01-091-0/+1
| | | | | | | | | | | | | | | | | | This prevents an assertion in ScopedLock on QNX following the recent V8 version bump. Change-Id: I34ec016847abfbaa477bf80e49b5714638ddcbdb Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * [V8] Implement OS::SetUp() and OS::TearDown() for QNXSean Harmer2013-01-091-28/+37
| | | | | | | | | | | | | | | | | | This is needed to not have unresolved symbols following a V8 version bump. Change-Id: I6f98573c08cdb803f691678d3986a2ed87038cdb Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * [V8] Implement new parts of platform port for QNXSean Harmer2013-01-091-0/+12
| | | | | | | | | | | | Change-Id: Id2323606334bd47da8532cd9a800626ec259e314 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * [V8] Update QNX platform port so that it builds once againSean Harmer2013-01-091-9/+3
| | | | | | | | | | | | Change-Id: I27bf62fba0219903d6c9aebd287de7091e4237f9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>