summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-22 16:50:29 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-25 11:54:27 +0000
commitf137957e0887a9321b69b9ba83ed6ccaedee57bb (patch)
treecc2639dc471ffb925b3ea4846f86fcf1cde8e7c8 /qmake
parenteb19cf15a9b9d9772e5c0023c6469dfac8de74d6 (diff)
optimize operator+ ProString vs. char*
we have all necessary overloads now. Change-Id: Ic4472eba15d4234e968fcb9443d0f79011aa43fd Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/library/proitems.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h
index 16dd9386c8..165ce40189 100644
--- a/qmake/library/proitems.h
+++ b/qmake/library/proitems.h
@@ -208,9 +208,9 @@ inline QString operator+(const QString &one, const ProString &two)
{ return ProString(one) + two; }
inline QString operator+(const ProString &one, const char *two)
- { return one + ProString(two); } // XXX optimize
+ { QString ret = one.toQStringRef() + two; ret.detach(); return ret; }
inline QString operator+(const char *one, const ProString &two)
- { return ProString(one) + two; } // XXX optimize
+ { QString ret = one + two.toQStringRef(); ret.detach(); return ret; }
inline QString &operator+=(QString &that, const ProString &other)
{ return that += other.toQStringRef(); }