diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-03 11:49:27 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-05 18:41:10 +0200 |
| commit | 52f3a7d9d40d3bf835bb0716ad201ee56731b980 (patch) | |
| tree | a736d2cca2516f2ad2003ff28b34e7a8ff483cf6 /qmake/generators/unix | |
| parent | ae7e701074be97130aa45f780e2456981850b432 (diff) | |
Build qmake with QT_USE_STRINGBUILDER
Should improve performance and is going to be required in
the future anyway.
Change-Id: I89d7c50441d2491da1ab0a4d564dcc91f52ade85
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'qmake/generators/unix')
| -rw-r--r-- | qmake/generators/unix/unixmake.h | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h index 28302b4f15..1f32e4341f 100644 --- a/qmake/generators/unix/unixmake.h +++ b/qmake/generators/unix/unixmake.h @@ -50,7 +50,7 @@ protected: bool findLibraries(bool linkPrl, bool mergeLflags) override; QString escapeFilePath(const QString &path) const override; - ProString escapeFilePath(const ProString &path) const { return MakefileGenerator::escapeFilePath(path); } + using MakefileGenerator::escapeFilePath; QStringList &findDependencies(const QString &) override; void init() override; 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; |