From 51d634ce2e7d4348a004d0807f53288cfbbb97ff Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 5 Jan 2012 10:38:10 +0100 Subject: Remove QtV8 library from QtBase The QtV8 library is going to live in the qtjsbackend module. Change-Id: I72251316163829411dda998b9503ce6f75b3606a Reviewed-by: Oswald Buddenhagen Reviewed-by: Aaron Kennedy Reviewed-by: Kent Hansen Reviewed-by: Rohan McGovern --- ...5-Allow-access-to-the-calling-script-data.patch | 48 ---------------------- 1 file changed, 48 deletions(-) delete mode 100644 src/v8/0005-Allow-access-to-the-calling-script-data.patch (limited to 'src/v8/0005-Allow-access-to-the-calling-script-data.patch') diff --git a/src/v8/0005-Allow-access-to-the-calling-script-data.patch b/src/v8/0005-Allow-access-to-the-calling-script-data.patch deleted file mode 100644 index 596e9573fc..0000000000 --- a/src/v8/0005-Allow-access-to-the-calling-script-data.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2081f6baaab81d60564680de600b4dcf03de6cd4 Mon Sep 17 00:00:00 2001 -From: Aaron Kennedy -Date: Fri, 14 Oct 2011 17:03:06 +1000 -Subject: [PATCH 05/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 193e2fe..c094d08 100644 ---- a/include/v8.h -+++ b/include/v8.h -@@ -3517,6 +3517,7 @@ class V8EXPORT Context { - */ - static Local GetCalling(); - static Local GetCallingQmlGlobal(); -+ static Local GetCallingScriptData(); - - /** - * Sets the security token for the context. To access an object in -diff --git a/src/api.cc b/src/api.cc -index 2d3d97a..54df40d 100644 ---- a/src/api.cc -+++ b/src/api.cc -@@ -4370,6 +4370,18 @@ v8::Local Context::GetCallingQmlGlobal() { - } - } - -+v8::Local Context::GetCallingScriptData() -+{ -+ i::Isolate* isolate = i::Isolate::Current(); -+ if (IsDeadCheck(isolate, "v8::Context::GetCallingScriptData()")) { -+ return Local(); -+ } -+ -+ i::JavaScriptFrameIterator it; -+ if (it.done()) return Local(); -+ i::Handle script(i::Script::cast(i::JSFunction::cast(it.frame()->function())->shared()->script())); -+ return Utils::ToLocal(i::Handle(script->data())); -+} - - v8::Local Context::Global() { - if (IsDeadCheck(i::Isolate::Current(), "v8::Context::Global()")) { --- -1.7.4.1 - -- cgit v1.2.3