summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2020-04-23 17:11:23 +0200
committerMarc Mutz <marc.mutz@kdab.com>2020-04-24 10:41:59 +0200
commitb32fc183812fc6fe4eb1c566d37ab3ddef3896f1 (patch)
tree371293a3da1e204ded2e6f740a1aec3b4d8b5293
parentdddd197d42929149eafc5cb7754b7e6b323a4e97 (diff)
QUrlIdna: re-enable NRVO
Change-Id: Id4f9b14f4255c661a0313ca18b0c5af5c55880e7 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--src/corelib/io/qurlidna.cpp4
1 files changed, 2 insertions, 2 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)
{
+ QString result;
if (domain.isEmpty())
- return domain;
+ return result;
- QString result;
result.reserve(domain.length());
const bool isIdnEnabled = op == NormalizeAce ? qt_is_idn_enabled(domain) : false;