summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/xml/sax/qxml.cpp2
-rw-r--r--tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 616ceeb042..b841debd66 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -1563,7 +1563,7 @@ QString QXmlInputSource::fromRawData(const QByteArray &data, bool beginning)
{
#ifdef QT_NO_TEXTCODEC
Q_UNUSED(beginning);
- return QString::fromAscii(data.constData(), data.size());
+ return QString::fromLatin1(data.constData(), data.size());
#else
if (data.size() == 0)
return QString();
diff --git a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
index d8b193f5c8..2b92f7c7b6 100644
--- a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
+++ b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
@@ -138,10 +138,10 @@ public slots:
{
QUrl url("http://127.0.0.1:1088");
QNetworkRequest req(url);
- req.setRawHeader("POST", url.path().toAscii());
+ req.setRawHeader("POST", url.path().toLatin1());
req.setRawHeader("user-agent", "xml-test");
req.setRawHeader("keep-alive", "false");
- req.setRawHeader("host", url.host().toAscii());
+ req.setRawHeader("host", url.host().toLatin1());
QByteArray xmlrpc("<methodCall>\r\n\
<methodName>SFD.GetVersion</methodName>\r\n\