6 files changed, 12 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/SourcePoolQt.h b/src/3rdparty/webkit/JavaScriptCore/parser/SourcePoolQt.h
index baed3ba..da58edb 100644
--- a/src/3rdparty/webkit/JavaScriptCore/parser/SourcePoolQt.h
+++ b/src/3rdparty/webkit/JavaScriptCore/parser/SourcePoolQt.h
@@ -28,6 +28,8 @@
 
 namespace JSC {
 
+    QT_USE_NAMESPACE
+
     class SourceCode;
     class Debugger;
 
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/UString.h b/src/3rdparty/webkit/JavaScriptCore/runtime/UString.h
index 0a53c50..ab64f52 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/UString.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/UString.h
@@ -366,12 +366,13 @@ namespace JSC {
         }
 
 #if PLATFORM(QT)
-        operator QString() const
+        operator QT_PREPEND_NAMESPACE(QString)() const
         {
+            QT_USE_NAMESPACE;
             return QString(reinterpret_cast<const 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());
         }
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
index bff770c..e3cb718 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
@@ -580,6 +580,7 @@ namespace WTF {
     };
 
 #if PLATFORM(QT)
+    QT_USE_NAMESPACE
     template<typename T>
     QDataStream& operator<<(QDataStream& stream, const Vector<T>& data)
     {
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/qt/MainThreadQt.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/qt/MainThreadQt.cpp
index 7b2d0f2..0ac2717 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/qt/MainThreadQt.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/qt/MainThreadQt.cpp
@@ -37,6 +37,8 @@
 
 namespace WTF {
 
+QT_USE_NAMESPACE
+
 class MainThreadInvoker : public QObject {
     Q_OBJECT
 public:
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/qt/ThreadingQt.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/qt/ThreadingQt.cpp
index 1fdd2bb..5a84764 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/qt/ThreadingQt.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/qt/ThreadingQt.cpp
@@ -41,6 +41,8 @@
 
 namespace WTF {
 
+QT_USE_NAMESPACE
+
 class ThreadPrivate : public QThread {
 public:
     ThreadPrivate(ThreadFunction entryPoint, void* data);
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h b/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
index 1531694..65b3e79 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
@@ -108,6 +108,8 @@ typedef uint32_t UChar32;
 namespace WTF {
 namespace Unicode {
 
+QT_USE_NAMESPACE
+
 enum Direction {
     LeftToRight = QChar::DirL,
     RightToLeft = QChar::DirR,