Merge the QJSEngine and QJSValue development branch into master.

This replaces the dependency to QtScript with two new builtin classes
QJSValue and QJSEngine.

This is still work in progress, development continues now in the master branch.

Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de
Reviewed-on: http://codereview.qt.nokia.com/2299
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>

1 files changed, 63 insertions, 0 deletions

diff --git a/src/v8/0011-QtScript-V8-Add-new-v8-api-to-check-if-a-value-is-an.patch b/src/v8/0011-QtScript-V8-Add-new-v8-api-to-check-if-a-value-is-an.patch
new file mode 100644
index 0000000000..0558ce19f6
--- /dev/null
+++ b/src/v8/0011-QtScript-V8-Add-new-v8-api-to-check-if-a-value-is-an.patch
@@ -0,0 +1,63 @@
+From 859c452847317efe1131e337fcd51514de616ea2 Mon Sep 17 00:00:00 2001
+From: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
+Date: Tue, 7 Dec 2010 11:56:42 +0100
+Subject: [PATCH] QtScript/V8: Add new v8 api to check if a value is an error.
+
+New function v8::Value::IsError was created.
+
+This API is experimental and added only for the purposes of our
+research.
+---
+ include/v8.h |    5 +++++
+ src/api.cc   |    6 ++++++
+ src/heap.h   |    1 +
+ 3 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/include/v8.h b/include/v8.h
+index 303cb7a..f992cb2 100644
+--- a/include/v8.h
++++ b/include/v8.h
+@@ -937,6 +937,11 @@ class Value : public Data {
+    */
+   V8EXPORT bool IsRegExp() const;
+ 
++  /**
++   * Returns true if this value is an Error.
++   */
++  V8EXPORT bool IsError() const;
++
+   V8EXPORT Local<Boolean> ToBoolean() const;
+   V8EXPORT Local<Number> ToNumber() const;
+   V8EXPORT Local<String> ToString() const;
+diff --git a/src/api.cc b/src/api.cc
+index fd4a76b..5ada246 100644
+--- a/src/api.cc
++++ b/src/api.cc
+@@ -2108,6 +2108,12 @@ bool Value::IsRegExp() const {
+   return obj->IsJSRegExp();
+ }
+ 
++bool Value::IsError() const {
++  if (IsDeadCheck(i::Isolate::Current(), "v8::Value::IsError()")) return false;
++  i::Handle<i::Object> obj = Utils::OpenHandle(this);
++  return obj->HasSpecificClassOf(HEAP->Error_symbol());
++}
++
+ 
+ Local<String> Value::ToString() const {
+   i::Handle<i::Object> obj = Utils::OpenHandle(this);
+diff --git a/src/heap.h b/src/heap.h
+index 8cbf378..db90bb9 100644
+--- a/src/heap.h
++++ b/src/heap.h
+@@ -169,6 +169,7 @@ inline Heap* _inline_get_heap_();
+   V(string_symbol, "string")                                             \
+   V(String_symbol, "String")                                             \
+   V(Date_symbol, "Date")                                                 \
++  V(Error_symbol, "Error")                                               \
+   V(this_symbol, "this")                                                 \
+   V(to_string_symbol, "toString")                                        \
+   V(char_at_symbol, "CharAt")                                            \
+-- 
+1.7.4.15.g7811d
+