diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2010-03-11 13:55:34 (GMT) |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2010-03-11 14:01:36 (GMT) |
| commit | ebf21bfac7009a72926010527226b1815f49a71d (patch) | |
| tree | 1f7072f7d60fefc44765513beb1c48c34ed2085c /src/3rdparty/javascriptcore | |
| parent | 44206523a280dffb1be40763ce10cc53f1e4eaa9 (diff) | |
| download | Qt-ebf21bfac7009a72926010527226b1815f49a71d.zip Qt-ebf21bfac7009a72926010527226b1815f49a71d.tar.gz Qt-ebf21bfac7009a72926010527226b1815f49a71d.tar.bz2 | |
Fix compilation with namespaced Qt
Diffstat (limited to 'src/3rdparty/javascriptcore')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/UString.h | 6 |
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()); } |