diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-05-18 20:00:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-21 02:44:22 +0200 |
| commit | f4d47945ba17db276e94046473816014ed0342e9 (patch) | |
| tree | 0860293b5688c45598b8d3b6cfa449dad6221d2f /qmake/generators/unix | |
| parent | cbf447069cfeb799ff5e09902be065d77f2e7707 (diff) | |
Use QStringList::join(QChar) overload where applicable [qmake]
This is an automated change performing the following replacements:
join\("(.)"\) -> join('\1')
join\(QLatin1String\("(.)"\)\) -> join(QLatin1Char('\1'))
join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1'))
Change-Id: I9c9964703dedfdab6e7bfac80be22bd5570e2e49
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators/unix')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index f8b482714d..6ddc4c68b6 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -327,7 +327,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) QStringList deps = findDependencies((*it).toQString()).filter(QRegExp( "((^|/)" + Option::h_moc_mod + "|" + Option::cpp_moc_ext + "$)")); if(!deps.isEmpty()) - t << d_file << ": " << deps.join(" ") << endl; + t << d_file << ": " << deps.join(' ') << endl; t << "-include " << d_file << endl; project->values("QMAKE_DISTCLEAN") += d_file; } @@ -642,10 +642,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << destdir << "$(TARGET): " << var("PRE_TARGETDEPS") << " " << var("POST_TARGETDEPS") << valList(build) << "\n\t"; ar = project->first("QMAKE_AR_CMD").toQString(); - ar = ar.replace("$(OBJECTS)", build.join(" ")); + ar = ar.replace("$(OBJECTS)", build.join(' ')); } else { t << (*libit) << ": " << valList(build) << "\n\t"; - ar = "$(AR) " + (*libit) + " " + build.join(" "); + ar = "$(AR) " + (*libit) + " " + build.join(' '); } if(!destdir.isEmpty()) t << mkdir_p_asstring(destdir) << "\n\t"; @@ -807,7 +807,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) const ProStringList &val = project->values((*var_it).toKey()); if(val.isEmpty()) continue; - t << "$(COPY_FILE) --parents " << val.join(" ") << " " << ddir_c << Option::dir_sep << " && "; + t << "$(COPY_FILE) --parents " << val.join(' ') << " " << ddir_c << Option::dir_sep << " && "; } } } @@ -877,7 +877,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) precomp_files += precomph_out_dir + header_prefix + "objective-c++" + header_suffix; } } - t << "-$(DEL_FILE) " << precomp_files.join(" ") << "\n\t"; + t << "-$(DEL_FILE) " << precomp_files.join(' ') << "\n\t"; } if(!project->isEmpty("IMAGES")) t << varGlue("QMAKE_IMAGE_COLLECTION", "\t-$(DEL_FILE) ", " ", "") << "\n\t"; @@ -1326,7 +1326,7 @@ UnixMakefileGenerator::writeLibtoolFile() libs << "QMAKE_LIBS"; //obvious one t << "dependency_libs='"; for (ProStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) - t << project->values((*it).toKey()).join(" ") << " "; + t << project->values((*it).toKey()).join(' ') << " "; t << "'\n\n"; t << "# Version information for " << lname << "\n"; |