diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-05 10:38:10 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-09 19:54:07 +0100 |
| commit | 51d634ce2e7d4348a004d0807f53288cfbbb97ff (patch) | |
| tree | 3674b78513a51a109df9384f2a479b91c9db5699 /src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch | |
| parent | 159098719b8e8f40d1bd663c61bdc51f883c645f (diff) | |
Remove QtV8 library from QtBase
The QtV8 library is going to live in the qtjsbackend module.
Change-Id: I72251316163829411dda998b9503ce6f75b3606a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch')
| -rw-r--r-- | src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch b/src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch deleted file mode 100644 index e3b65f5ee2..0000000000 --- a/src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ecd533461383671ea465b37f2cad84a0aad3d52 Mon Sep 17 00:00:00 2001 -From: Aaron Kennedy <aaron.kennedy@nokia.com> -Date: Fri, 9 Sep 2011 14:16:12 +1000 -Subject: [PATCH 07/13] Allow a script to be flagged as "native" - -Native scripts do not appear in backtraces, or in the source and -line number when exceptions are thrown from within them. This is -useful to be able to write code in JavaScript instead of C++ and -still have it appear sensibly to the user. ---- - include/v8.h | 5 +++-- - src/compiler.cc | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/include/v8.h b/include/v8.h -index 6baf2b2..229ddbd 100644 ---- a/include/v8.h -+++ b/include/v8.h -@@ -588,8 +588,9 @@ class ScriptOrigin { - class V8EXPORT Script { - public: - enum CompileFlags { -- Default = 0x00, -- QmlMode = 0x01 -+ Default = 0x00, -+ QmlMode = 0x01, -+ NativeMode = 0x02 - }; - - /** -diff --git a/src/compiler.cc b/src/compiler.cc -index 4902e72..cabca74 100644 ---- a/src/compiler.cc -+++ b/src/compiler.cc -@@ -499,7 +499,7 @@ Handle<SharedFunctionInfo> Compiler::Compile(Handle<String> source, - - // Create a script object describing the script to be compiled. - Handle<Script> script = FACTORY->NewScript(source); -- if (natives == NATIVES_CODE) { -+ if (natives == NATIVES_CODE || compile_flags & v8::Script::NativeMode) { - script->set_type(Smi::FromInt(Script::TYPE_NATIVE)); - } - if (!script_name.is_null()) { --- -1.7.4.1 - |