qmake: Don't assume that GNUmake is able to resolve arbitrary dependencies

Extra compilers may define a depend_command that's used to generate
dependencies for each input. When GNUmake was enabled we failed to
run this command, which was affecting resource files, as resource
dependencies are handled by an extra compiler defined in resources.prf.

The result was that changes to resources included in a resources-file
did not trigger a re-run of qrc and subsequent recompile of the
resource object file.

We must always run these custom dependency commands, even when GNUmake
(and the extended gcc_MD_depends option) is enabled, as GCC is only able
to handle regular #include-type dependencies. Hence, the check for the
'include_deps' flag was removed from doDepends(), and the check for
GNUmake was moved to the one place where it still made sense -- when
deciding whether or not to do recursive dependency checking.

Change-Id: I5ddb75c873120c90f798808efc52e81500786301
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index d08f214c0c..1d4e6cabf3 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -638,7 +638,7 @@ MakefileGenerator::init()
         }
     }
 
-    if(noIO() || !doDepends())
+    if(noIO() || !doDepends() || project->isActiveConfig("GNUmake"))
         QMakeSourceFileInfo::setDependencyMode(QMakeSourceFileInfo::NonRecursive);
     for(x = 0; x < compilers.count(); ++x)
         initCompiler(compilers.at(x));
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index 0b8d269181..04ee0ee873 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -59,7 +59,7 @@ public:
 
 protected:
     virtual bool doPrecompiledHeaders() const { return project->isActiveConfig("precompile_header"); }
-    virtual bool doDepends() const { return !include_deps && !Option::mkfile::do_stub_makefile && MakefileGenerator::doDepends(); }
+    virtual bool doDepends() const { return !Option::mkfile::do_stub_makefile && MakefileGenerator::doDepends(); }
     virtual QString defaultInstall(const QString &);
     virtual void processPrlVariable(const QString &, const QStringList &);
     virtual void processPrlFiles();