diff options
author | Liang Qi <liang.qi@qt.io> | 2019-02-23 07:49:33 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-02-23 10:19:34 +0000 |
commit | 19a9768f1a62366f1bee16a7cb9b3256ef851efe (patch) | |
tree | 9d41df69dd52b5f49ae008c9eaf1aca9f53e1e55 /qmake/generators/makefile.cpp | |
parent | bdf1c4f671c706832cea84269e91995e85eb9f07 (diff) | |
parent | 2a1292b9168d40e71c9e67a41d3b8c499b8e222b (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'qmake/generators/makefile.cpp')
-rw-r--r-- | qmake/generators/makefile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index b9ac3d2b5e..b757c55607 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -81,8 +81,8 @@ bool MakefileGenerator::canExecute(const QStringList &cmdline, int *a) const QString MakefileGenerator::mkdir_p_asstring(const QString &dir, bool escape) const { - QString edir = escape ? escapeFilePath(Option::fixPathToTargetOS(dir, false, false)) : dir; - return "@" + makedir.arg(edir); + return "@" + makedir.arg( + escape ? escapeFilePath(Option::fixPathToTargetOS(dir, false, false)) : dir); } bool MakefileGenerator::mkdir(const QString &in_path) const |