From 6aa15690ffba0772ffeebf3d5199d94fa0d72bff Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 1 Jul 2013 17:53:49 -0700
Subject: [PATCH] QUrl: remove temporary code

The setting of EncodeDelimiters was temporary until we could remove the
old qt_urlRecode "decode all" mode (not the FullyDecoded mode, that
stays).

Change-Id: Ic07ebe4bb7fc72351b65bfb4619b71206cc8c0cd
Reviewed-by: David Faure (KDE) <faure@kde.org>
---
 src/corelib/io/qurl.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 7aa944c634..ac099591ba 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -774,8 +774,6 @@ recodeFromUser(const QString &input, const ushort *actions, int from, int to)
 static inline void appendToUser(QString &appendTo, const QString &value, QUrl::FormattingOptions options,
                                 const ushort *actions)
 {
-    options |= QUrl::EncodeDelimiters;
-
     if (options == QUrl::PrettyDecoded) {
         appendTo += value;
         return;
@@ -833,7 +831,6 @@ inline void QUrlPrivate::appendUserInfo(QString &appendTo, QUrl::FormattingOptio
         }
     }
 
-    options |= QUrl::EncodeDelimiters;
     if (!qt_urlRecode(appendTo, userName.constData(), userName.constEnd(), options, userNameActions))
         appendTo += userName;
     if (options & QUrl::RemovePassword || !hasPassword()) {