diff options
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 1e522cc8ee..f26dbbc40b 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2196,7 +2196,7 @@ void VCFilter::modifyPCHstage(QString str) break; } } - bool isHFile = Option::hasFileExtension(str, Option::h_ext) && (str == Project->precompH); + const bool isHFile = (str == Project->precompH); bool isCPPFile = pchThroughSourceFile && (str == Project->precompCPP); if(!isCFile && !isHFile && !isCPPFile) @@ -2399,11 +2399,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) if (!CustomBuildTool.Description.isEmpty()) CustomBuildTool.Description += ", "; CustomBuildTool.Description += cmd_name; - // Execute custom build steps in an environment variable scope to prevent unwanted - // side effects for downstream build steps - CustomBuildTool.CommandLine += QLatin1String("setlocal"); CustomBuildTool.CommandLine += VCToolBase::fixCommandLine(cmd.trimmed()); - CustomBuildTool.CommandLine += QLatin1String("endlocal"); int space = cmd.indexOf(' '); QFileInfo finf(cmd.left(space)); if (CustomBuildTool.ToolPath.isEmpty()) @@ -2414,7 +2410,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) // Make sure that all deps are only once QStringList uniqDeps; for (int c = 0; c < deps.count(); ++c) { - QString aDep = deps.at(c).trimmed(); + QString aDep = deps.at(c); if (!aDep.isEmpty()) uniqDeps << aDep; } |