diff options
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 8c25ab6f9b..d6d40bcc68 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2311,7 +2311,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) inputs += Option::fixPathToTargetOS(file, false); } } - deps += inputs; // input files themselves too.. + deps = inputs + deps; // input files themselves too.. // Replace variables for command w/all input files // ### join gives path issues with directories containing spaces! @@ -2319,7 +2319,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) inputs.join(' '), out); } else { - deps += inFile; // input file itself too.. + deps.prepend(inFile); // input file itself too.. cmd = Project->replaceExtraCompilerVariables(tmp_cmd, inFile, out); @@ -2356,14 +2356,14 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) deps += CustomBuildTool.AdditionalDependencies; // Make sure that all deps are only once - QHash<QString, bool> uniqDeps; + QStringList uniqDeps; for (int c = 0; c < deps.count(); ++c) { QString aDep = deps.at(c).trimmed(); if (!aDep.isEmpty()) - uniqDeps[aDep] = false; + uniqDeps << aDep; } - CustomBuildTool.AdditionalDependencies = uniqDeps.keys(); - CustomBuildTool.AdditionalDependencies.sort(); + uniqDeps.removeDuplicates(); + CustomBuildTool.AdditionalDependencies = uniqDeps; } // Ensure that none of the output files are also dependencies. Or else, the custom buildstep |