diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:47 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:47 +0100 |
| commit | 0655209fdad022bd0f6eb20ce85522cb56506bf0 (patch) | |
| tree | cdba0c1590655f5cb75a68cedff74f8a683db3a2 /src/qml/qml/qqmlxmlhttprequest.cpp | |
| parent | c3babc03c99c6ca5fa210486e133eb456a405bab (diff) | |
| parent | 3d8f103c2641f35e7681485102a1b59886db8934 (diff) | |
Merge master into api_changes
Conflicts:
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlpropertycache.cpp
Change-Id: I5193a193fa301c0b518291645bf626a5fa07118f
Diffstat (limited to 'src/qml/qml/qqmlxmlhttprequest.cpp')
| -rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index df1712976c..56743eb915 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -1384,7 +1384,7 @@ void QQmlXMLHttpRequest::readEncoding() if (header.first == "content-type") { int separatorIdx = header.second.indexOf(';'); if (separatorIdx == -1) { - m_mime == header.second; + m_mime = header.second; } else { m_mime = header.second.mid(0, separatorIdx); int charsetIdx = header.second.indexOf("charset="); |