From ebf21bfac7009a72926010527226b1815f49a71d Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Thu, 11 Mar 2010 14:55:34 +0100
Subject: Fix compilation with namespaced Qt

---
 src/3rdparty/javascriptcore/JavaScriptCore/runtime/UString.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UString.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UString.h
index 2e21f9d..c1f32db 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UString.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UString.h
@@ -83,12 +83,12 @@ namespace JSC {
 
     public:
 #if PLATFORM(QT)
-        operator QString() const
+        operator QT_PREPEND_NAMESPACE(QString)() const
         {
-            return QString(reinterpret_cast<const QChar*>(this->data()), this->size());
+            return QT_PREPEND_NAMESPACE(QString)(reinterpret_cast<const QT_PREPEND_NAMESPACE(QChar)*>(this->data()), this->size());
         }
 
-        UString(const QString& str)
+        UString(const QT_PREPEND_NAMESPACE(QString)& str)
         {
             *this = JSC::UString(reinterpret_cast<const UChar*>(str.constData()), str.length());
         }
-- 
cgit v0.12