diff options
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index b474dac7a5..daaef0fbc4 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2181,11 +2181,11 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) // All information about the extra compiler QString tmp_out = Project->project->first(extraCompilerName + ".output"); - QString tmp_cmd = Project->project->variables()[extraCompilerName + ".commands"].join(" "); - QString tmp_cmd_name = Project->project->variables()[extraCompilerName + ".name"].join(" "); - QStringList tmp_dep = Project->project->variables()[extraCompilerName + ".depends"]; - QString tmp_dep_cmd = Project->project->variables()[extraCompilerName + ".depend_command"].join(" "); - QStringList configs = Project->project->variables()[extraCompilerName + ".CONFIG"]; + QString tmp_cmd = Project->project->values(extraCompilerName + ".commands").join(" "); + QString tmp_cmd_name = Project->project->values(extraCompilerName + ".name").join(" "); + QStringList tmp_dep = Project->project->values(extraCompilerName + ".depends"); + QString tmp_dep_cmd = Project->project->values(extraCompilerName + ".depend_command").join(" "); + QStringList configs = Project->project->values(extraCompilerName + ".CONFIG"); bool combined = configs.indexOf("combine") != -1; QString cmd, cmd_name, out; @@ -2248,9 +2248,9 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) // Command for file if (combined) { // Add dependencies for each file - QStringList tmp_in = Project->project->variables()[extraCompilerName + ".input"]; + QStringList tmp_in = Project->project->values(extraCompilerName + ".input"); for (int a = 0; a < tmp_in.count(); ++a) { - const QStringList &files = Project->project->variables()[tmp_in.at(a)]; + const QStringList &files = Project->project->values(tmp_in.at(a)); for (int b = 0; b < files.count(); ++b) { deps += Project->findDependencies(files.at(b)); inputs += Option::fixPathToTargetOS(files.at(b), false); |