diff options
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 0412b52813..19975bc8bb 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -134,7 +134,7 @@ UnixMakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator:: if (!dist_directory.startsWith(Option::dir_sep)) dist_directory.prepend(Option::dir_sep); - QString out_directory_cdin = out_directory.isEmpty() ? "\n\t" + QString out_directory_cdin = out_directory.isEmpty() ? QString("\n\t") : "\n\tcd " + escapeFilePath(out_directory) + " && "; QString makefilein = " -e -f " + escapeFilePath(subtarget->makefile) + " distdir DISTDIR=$(DISTDIR)" + escapeFilePath(dist_directory); @@ -749,7 +749,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) (!isShallowBundle ? (isFramework ? ("Versions/" + project->first("QMAKE_FRAMEWORK_VERSION") + "/Resources/") - : "Contents/") + : QString("Contents/")) : QString()) + "Info.plist"; bundledFiles << info_plist_out; |