Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  look for makespec in the build dir first
  make collection of SUBDIRS in solution generator less bizarre
  run depend_command in build dir in VS generators as well
  fixify target source against build tree
  fix fixifying of QMAKE_SUBSTITUTES
  dist target: fixify OBJECTS_DIR against output dir
  fix paths of vpath-resolved files
  simplify: absolute fixification ignores the base dir arguments
  simplify: fileFixify for all same paths is always "."
  simplify: the input and output dirs are already normalized
  stop fixifying after first success
  create a pwd string with a trailing slash only on demand
  make uic3-generated moc files depend on mocinclude.tmp
  useful location reporting for errors from QMAKE_SUBSTITUTES
  clean up visual studio identification code
  prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed"
  fix detection of relative location information

1 files changed, 4 insertions, 1 deletions

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 87c8943..0a24a01 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -2218,6 +2218,9 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
 							             Option::fixPathToLocalOS(inFile, true, false),
                                                                      out);
             if(Project->canExecute(dep_cmd)) {
+                dep_cmd.prepend(QLatin1String("cd ")
+                                + Project->escapeFilePath(Option::fixPathToLocalOS(Option::output_dir, false))
+                                + QLatin1String(" && "));
                 if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) {
                     QString indeps;
                     while(!feof(proc)) {
@@ -2232,7 +2235,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
                         for (int i = 0; i < extradeps.count(); ++i) {
                             QString dd = extradeps.at(i).simplified();
                             if (!dd.isEmpty())
-                                deps += Project->fileFixify(dd);
+                                deps += Project->fileFixify(dd, QString(), Option::output_dir);
                         }
                     }
                 }