summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkaccesshttpbackend.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-02-02 02:41:42 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-02-02 02:41:42 (GMT)
commit662666a5d4d114f91dbed8cbe3ce46fddfe3c82b (patch)
tree0b72d67d46bf1693e1b3e2b8669fef8c8c89e766 /src/network/access/qnetworkaccesshttpbackend.cpp
parent35a211cd95e0d09ef0b547b57f01f0a9ff41da2f (diff)
parent64ca7030df6189a0bc4df36473befd868c8d2ef6 (diff)
downloadQt-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.zip
Qt-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.tar.gz
Qt-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.tar.bz2
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts: tools/linguist/lupdate/main.cpp
Diffstat (limited to 'src/network/access/qnetworkaccesshttpbackend.cpp')
-rw-r--r--src/network/access/qnetworkaccesshttpbackend.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 58123b2..61a95fe 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -753,7 +753,7 @@ void QNetworkAccessHttpBackend::replyHeaderChanged()
QByteArray value = rawHeader(it->first);
if (!value.isEmpty()) {
if (qstricmp(it->first.constData(), "set-cookie") == 0)
- value += "\n";
+ value += '\n';
else
value += ", ";
}