diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-01-02 14:28:39 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-01-24 13:25:06 +0100 |
| commit | 41b919919eb05299cc382de0da7d25892a120dd5 (patch) | |
| tree | 1d43fbf0642eaa37d770371e7d479b6d86ce4ea1 /qmake/generators/win32 | |
| parent | 16885a6033405e1ed28ac42f9dfec7339975e85e (diff) | |
Purge the dep_cd_cmd parameter from callExtraCompilerDependCommand
We always pass the same value. The builtins are also using exactly this
"cd command" unconditionally.
This deduplicates the code at the call sites of
callExtraCompilerDependCommand a bit.
Change-Id: I5c412c815d50afdac55e1b45021f37f2545ce8f0
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 5 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 2b39a4baaa..3002ce889c 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2351,10 +2351,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) if (!tmp_dep.isEmpty()) deps = tmp_dep; if (!tmp_dep_cmd.isEmpty()) { - const QString dep_cd_cmd = QLatin1String("cd ") - + IoUtils::shellQuote(Option::fixPathToLocalOS(Option::output_dir, false)) - + QLatin1String(" && "); - Project->callExtraCompilerDependCommand(extraCompilerName, dep_cd_cmd, tmp_dep_cmd, + Project->callExtraCompilerDependCommand(extraCompilerName, tmp_dep_cmd, inFile, out, true, // dep_lines &deps, diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 80f444820a..e117f472e0 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1483,12 +1483,8 @@ void VcprojGenerator::initResourceFiles() if(!rcc_dep_cmd.isEmpty()) { const QStringList qrc_files = project->values("RESOURCES").toQStringList(); QStringList deps; - const QString rcc_dep_cd_cmd = QLatin1String("cd ") - + IoUtils::shellQuote(Option::fixPathToLocalOS(Option::output_dir, false)) - + QLatin1String(" && "); for (const QString &qrc_file : qrc_files) { callExtraCompilerDependCommand("rcc", - rcc_dep_cd_cmd, rcc_dep_cmd, qrc_file, QString(), |