From e45a9fe457a4e5e70bf4e62092b253675dc97819 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 13 May 2016 15:21:05 +0200 Subject: add ProStringList::join(ProString) overload and make use of it this introduces an ambiguity, so some char* arguments need explicit QString construction now. Change-Id: Ic3919a1fa9419bbb3b57dd1aa7eb95643ee59e53 Reviewed-by: Joerg Bornemann --- qmake/library/proitems.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'qmake/library/proitems.cpp') diff --git a/qmake/library/proitems.cpp b/qmake/library/proitems.cpp index 5f923744be..dc84c40d06 100644 --- a/qmake/library/proitems.cpp +++ b/qmake/library/proitems.cpp @@ -365,6 +365,11 @@ static QString ProStringList_join(const ProStringList &this_, const QChar *sep, return res; } +QString ProStringList::join(const ProString &sep) const +{ + return ProStringList_join(*this, sep.constData(), sep.size()); +} + QString ProStringList::join(const QString &sep) const { return ProStringList_join(*this, sep.constData(), sep.size()); -- cgit v1.2.3