From b32fc183812fc6fe4eb1c566d37ab3ddef3896f1 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 23 Apr 2020 17:11:23 +0200
Subject: [PATCH] QUrlIdna: re-enable NRVO
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id4f9b14f4255c661a0313ca18b0c5af5c55880e7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/io/qurlidna.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp
index a2f0caa606..9b474c0654 100644
--- a/src/corelib/io/qurlidna.cpp
+++ b/src/corelib/io/qurlidna.cpp
@@ -2487,10 +2487,10 @@ static int nextDotDelimiter(const QString &domain, int from = 0)
 
 QString qt_ACE_do(const QString &domain, AceOperation op, AceLeadingDot dot)
 {
-    if (domain.isEmpty())
-        return domain;
-
     QString result;
+    if (domain.isEmpty())
+        return result;
+
     result.reserve(domain.length());
 
     const bool isIdnEnabled = op == NormalizeAce ? qt_is_idn_enabled(domain) : false;