summaryrefslogtreecommitdiffstats
path: root/qmake/generators/mac
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-09-16 13:49:26 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-09-16 14:52:40 +0200
commit8c6755aeec312ae771ef334fc863642514db3f7c (patch)
tree3ccec405ee35690bdb7def6c0a3c42866bd9adc2 /qmake/generators/mac
parent104debb6627d71f5540bb2c3347ce56dddc63594 (diff)
parentc40a48af997f57caa0ecfca0b247837ba5b2f89b (diff)
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: src/corelib/tools/qstring.cpp Change-Id: Ifc6cd3a0f1cf14cc0fe6cf30afb0c7f40cfdbc3e
Diffstat (limited to 'qmake/generators/mac')
-rw-r--r--qmake/generators/mac/pbuilder_pbx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.h b/qmake/generators/mac/pbuilder_pbx.h
index a08dc7c2bd..8813a190a9 100644
--- a/qmake/generators/mac/pbuilder_pbx.h
+++ b/qmake/generators/mac/pbuilder_pbx.h
@@ -84,7 +84,7 @@ protected:
virtual QString escapeFilePath(const QString &path) const;
ProString escapeFilePath(const ProString &path) const { return MakefileGenerator::escapeFilePath(path); }
bool doPrecompiledHeaders() const { return false; }
- virtual bool doDepends() const { return false; } //never necesary
+ virtual bool doDepends() const { return writingUnixMakefileGenerator && UnixMakefileGenerator::doDepends(); }
};
inline ProjectBuilderMakefileGenerator::~ProjectBuilderMakefileGenerator()