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/generators/unix | |
| 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/generators/unix')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 9312f19418..c53393e268 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -241,13 +241,14 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << "\\\n\t\t" << (*objit); } if(incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done! - t << escapeFilePaths(incrs_out).join(" \\\n\t\t") << endl; + t << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << endl; } else if(!incrs_out.count()) { t << endl; } else { src_incremental = true; t << endl; - t << "INCREMENTAL_OBJECTS = " << escapeFilePaths(incrs_out).join(" \\\n\t\t") << endl; + t << "INCREMENTAL_OBJECTS = " + << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << endl; } } else { // Used all over the place in both deps and commands. |