diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-07-29 11:24:12 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-29 11:24:12 +0200 |
| commit | e98ec548d4f7b0558742014933457f756bdd8bf1 (patch) | |
| tree | fcbecb6fd9da1cf4871de2e6c0e626f910af6bbb /src/declarative/qml/qdeclarativexmlhttprequest.cpp | |
| parent | 510c8d6bd7c7623bb41878b8246375a403f3ba1d (diff) | |
Fix compilation with QT_NO_TEXTCODEC
Merge-request: 755
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativexmlhttprequest.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativexmlhttprequest.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp index d5b7ecce25..ff1a0e98ae 100644 --- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp +++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp @@ -1306,10 +1306,11 @@ QString QDeclarativeXMLHttpRequest::responseBody() const { QXmlStreamReader reader(m_responseEntityBody); reader.readNext(); +#ifndef QT_NO_TEXTCODEC QTextCodec *codec = QTextCodec::codecForName(reader.documentEncoding().toString().toUtf8()); if (codec) return codec->toUnicode(m_responseEntityBody); - +#endif return QString::fromUtf8(m_responseEntityBody); } |