1 files changed, 8 insertions, 0 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 79a7031..6c212d7 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -53,8 +53,12 @@
 QT_BEGIN_NAMESPACE
 
 #ifdef Q_OS_WIN32
+#if defined(Q_CC_MWERKS)
+#include "qpopen.h"
+#else
 #define QT_POPEN _popen
 #define QT_PCLOSE _pclose
+#endif
 #else
 #define QT_POPEN popen
 #define QT_PCLOSE pclose
@@ -84,6 +88,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo
     QString build_args(const QString &outdir=QString());
     void checkMultipleDefinition(const QString &, const QString &);
 
+protected:
     //internal caches
     mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache;
     mutable QHash<QString, QStringList> dependsCache;
@@ -116,9 +121,12 @@ protected:
     enum SubTargetFlags {
         SubTargetInstalls=0x01,
         SubTargetOrdered=0x02,
+        SubTargetSkipDefaultVariables=0x04,
+        SubTargetSkipDefaultTargets=0x08,
 
         SubTargetsNoFlags=0x00
     };
+    QList<MakefileGenerator::SubTarget*> findSubDirsSubTargets() const;
     void writeSubTargets(QTextStream &t, QList<SubTarget*> subtargets, int flags);
 
     //extra compiler interface