diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-08-16 14:00:13 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-29 14:20:43 +0200 |
commit | e71904e231e27e6f6f88b35c4a7e2d7cf8ba2640 (patch) | |
tree | 3a5f88fbd03efa5b130d591a4ebd1df4957c420b /src/declarative/v8/0006-Allow-access-to-the-calling-script-data.patch | |
parent | e233d8aa0710f8253e6ca2635cf6c9afa95757d2 (diff) |
Remove V8 submodule from QtDeclarative
QtDeclarative should now link against the QtV8 library
from qtbase.
The patch files have been moved to qtbase as well.
Applications that use the QtDeclarative private headers
may need to add the following to their .pro file:
QT += v8-private
This ensures that <private/v8.h> is found, which is
(indirectly) included by many QtDeclarative private
headers.
Task-number: QTBUG-20963
Change-Id: I31e973a6fcc0c416d3b258a61c26564cee3dcd4b
Reviewed-on: http://codereview.qt.nokia.com/3093
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/declarative/v8/0006-Allow-access-to-the-calling-script-data.patch')
-rw-r--r-- | src/declarative/v8/0006-Allow-access-to-the-calling-script-data.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/src/declarative/v8/0006-Allow-access-to-the-calling-script-data.patch b/src/declarative/v8/0006-Allow-access-to-the-calling-script-data.patch deleted file mode 100644 index b9c44654cd..0000000000 --- a/src/declarative/v8/0006-Allow-access-to-the-calling-script-data.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f890f0d1a1e5bd62711815489c87755a4f382436 Mon Sep 17 00:00:00 2001 -From: Aaron Kennedy <aaron.kennedy@nokia.com> -Date: Wed, 25 May 2011 10:36:13 +1000 -Subject: [PATCH 06/13] Allow access to the calling script data - ---- - include/v8.h | 1 + - src/api.cc | 12 ++++++++++++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -diff --git a/include/v8.h b/include/v8.h -index a858eae..9aba4a8 100644 ---- a/include/v8.h -+++ b/include/v8.h -@@ -3336,6 +3336,7 @@ class V8EXPORT Context { - */ - static Local<Context> GetCalling(); - static Local<Object> GetCallingQmlGlobal(); -+ static Local<Value> GetCallingScriptData(); - - /** - * Sets the security token for the context. To access an object in -diff --git a/src/api.cc b/src/api.cc -index 39767f4..ff74efb 100644 ---- a/src/api.cc -+++ b/src/api.cc -@@ -3976,6 +3976,18 @@ v8::Local<v8::Object> Context::GetCallingQmlGlobal() { - } - } - -+v8::Local<v8::Value> Context::GetCallingScriptData() -+{ -+ i::Isolate* isolate = i::Isolate::Current(); -+ if (IsDeadCheck(isolate, "v8::Context::GetCallingScriptData()")) { -+ return Local<Object>(); -+ } -+ -+ i::JavaScriptFrameIterator it; -+ if (it.done()) return Local<Object>(); -+ i::Handle<i::Script> script(i::Script::cast(i::JSFunction::cast(it.frame()->function())->shared()->script())); -+ return Utils::ToLocal(i::Handle<i::Object>(script->data())); -+} - - v8::Local<v8::Object> Context::Global() { - if (IsDeadCheck(i::Isolate::Current(), "v8::Context::Global()")) { --- -1.7.2.3 - |