summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/runtime/UString.h6
1 files 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());
}