From 5ab700f63993d616c37e0470c4aaeb80e7472cd9 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 7 May 2012 01:00:16 +0200 Subject: Restore QUrl::setEncodedQuery(QByteArray()) to the Qt4 behavior. Null bytearray means no query, and QString::fromLatin1(QByteArray()) doesn't give a null string, but an empty string. Same for setEncodedFragment(QByteArray()). Change-Id: I992e9253e35941d66886456872ea06aa2ae92450 Reviewed-by: Thiago Macieira --- src/corelib/io/qurl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/io/qurl.h') diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 7c6e47c73f..79968e5587 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -294,12 +294,12 @@ public: QT_DEPRECATED QByteArray encodedQuery() const { return toLatin1_helper(query(FullyEncoded)); } QT_DEPRECATED void setEncodedQuery(const QByteArray &value) - { setQuery(QString::fromLatin1(value)); } + { setQuery(value.isNull() ? QString() : QString::fromLatin1(value)); } QT_DEPRECATED QByteArray encodedFragment() const { return toLatin1_helper(fragment(FullyEncoded)); } QT_DEPRECATED void setEncodedFragment(const QByteArray &value) - { setFragment(QString::fromLatin1(value)); } + { setFragment(value.isNull() ? QString() : QString::fromLatin1(value)); } private: // helper function for the encodedQuery and encodedFragment functions -- cgit v1.2.3