diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-13 15:21:05 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-24 12:38:47 +0000 |
| commit | e45a9fe457a4e5e70bf4e62092b253675dc97819 (patch) | |
| tree | 5f96833425131cc8dfc7a8bdd99367278837063d /qmake/library/proitems.h | |
| parent | 4c56466f431b237f636f66c263d21d3bc9152260 (diff) | |
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 <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/library/proitems.h')
| -rw-r--r-- | qmake/library/proitems.h | 1 |
1 files changed, 1 insertions, 0 deletions
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; |