diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-04 15:58:39 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-04 15:58:39 +0200 |
| commit | b5695bd5be908970244919bcd7c19cbf7ccca2c4 (patch) | |
| tree | 29f1e2895bef25db5b47e7e2cf01414f6b32ac8d /tests/auto/network/access/qnetworkreply | |
| parent | 840729a931a7d3fefbc4b4a8e01f8b1bd69a427e (diff) | |
| parent | b7744e0b05255fc468db2af215ba94eca4b7757b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ibd81cd1df4a0650d93fcb556a57be90be2e1f569
Diffstat (limited to 'tests/auto/network/access/qnetworkreply')
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 21a84dfbb2..93bdbdd6a5 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -7310,7 +7310,11 @@ void tst_QNetworkReply::qtbug45581WrongReplyStatusCode() const QByteArray expectedContent = "<root attr=\"value\" attr2=\"value2\">" - "<person /><fruit /></root>\n"; + "<person /><fruit /></root>" +#ifdef Q_OS_WIN + "\r" +#endif + "\n"; QCOMPARE(reply->readAll(), expectedContent); |