From e458d70a0d18538346f41b503114c9ebe6b2ce12 Mon Sep 17 00:00:00 2001
From: Leon Clarke <leonclarke@google.com>
Date: Thu, 15 Jul 2010 12:03:35 +0100
Subject: Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
---
 JavaScriptCore/qt/api/qscriptstring_p.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'JavaScriptCore/qt/api/qscriptstring_p.h')

diff --git a/JavaScriptCore/qt/api/qscriptstring_p.h b/JavaScriptCore/qt/api/qscriptstring_p.h
index d4fc88e..fe84f4d 100644
--- a/JavaScriptCore/qt/api/qscriptstring_p.h
+++ b/JavaScriptCore/qt/api/qscriptstring_p.h
@@ -46,6 +46,8 @@ public:
 
     inline quint64 id() const;
 
+    inline operator JSStringRef() const;
+
 private:
     JSStringRef m_string;
 };
@@ -109,4 +111,14 @@ quint64 QScriptStringPrivate::id() const
     return reinterpret_cast<quint32>(m_string);
 }
 
+/*!
+    \internal
+    This method should be used for invoking JSC functions.
+    \note This method keeps ownership of an internal JSStringRef.
+*/
+QScriptStringPrivate::operator JSStringRef() const
+{
+    return m_string;
+}
+
 #endif // qscriptstring_p_h
-- 
cgit v1.1