diff options
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/UString.h')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/UString.h | 5 |
1 files changed, 3 insertions, 2 deletions
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()); } |