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.h | 1 + 1 file changed, 1 insertion(+) (limited to 'qmake/library/proitems.h') diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h index dcff970600..f373f928df 100644 --- a/qmake/library/proitems.h +++ b/qmake/library/proitems.h @@ -233,6 +233,7 @@ public: int length() const { return size(); } + QString join(const ProString &sep) const; QString join(const QString &sep) const; QString join(QChar sep) const; -- cgit v1.2.3