From 9e59f3e021e78a5b825b7673248e0bf37ac935f1 Mon Sep 17 00:00:00 2001
From: Andy Shaw <qt-info@nokia.com>
Date: Thu, 8 Oct 2009 12:55:21 +0200
Subject: Revert "Ensure that qmake doesn't lose the error code when processing
 subdirs"

This reverts commit c15b370c9db16fdbfd9e7bec89ee9bf8c1110827 since it is
causing a problem with the autotests so that will be investigated further
before this is resubmitted.
---
 qmake/generators/metamakefile.cpp | 14 ++++++--------
 qmake/generators/metamakefile.h   |  2 +-
 qmake/main.cpp                    |  5 +----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 3acb2dd..69dd627 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -291,7 +291,7 @@ SubdirsMetaMakefileGenerator::init()
     if(init_flag)
         return false;
     init_flag = true;
-    bool hasError = false;
+
     if(Option::recursive) {
         QString old_output_dir = Option::output_dir;
 	QString old_output = Option::output.fileName();
@@ -336,7 +336,7 @@ SubdirsMetaMakefileGenerator::init()
             }
             qmake_setpwd(sub->input_dir);
             Option::output_dir = sub->output_dir;
-            hasError |= !sub_proj->read(subdir.fileName());
+            sub_proj->read(subdir.fileName());
             if(!sub_proj->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
                 fprintf(stderr, "Project file(%s) not recursed because all requirements not met:\n\t%s\n",
                         subdir.fileName().toLatin1().constData(),
@@ -351,7 +351,7 @@ SubdirsMetaMakefileGenerator::init()
             } else {
                 const QString output_name = Option::output.fileName();
                 Option::output.setFileName(sub->output_file);
-                hasError |= !sub->makefile->write(sub->output_dir);
+                sub->makefile->write(sub->output_dir);
                 delete sub;
                 qmakeClearCaches();
                 sub = 0;
@@ -376,7 +376,7 @@ SubdirsMetaMakefileGenerator::init()
     self->makefile->init();
     subs.append(self);
 
-    return !hasError;
+    return true;
 }
 
 bool
@@ -745,7 +745,7 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO)
 }
 
 MetaMakefileGenerator *
-MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &name, bool op, bool *success)
+MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &name, bool op)
 {
     MetaMakefileGenerator *ret = 0;
     if ((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
@@ -758,9 +758,7 @@ MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &na
     }
     if (!ret)
         ret = new BuildsMetaMakefileGenerator(proj, name, op);
-    bool res = ret->init();
-    if (success)
-        *success = res;
+    ret->init();
     return ret;
 }
 
diff --git a/qmake/generators/metamakefile.h b/qmake/generators/metamakefile.h
index f74f4a2..e69304a 100644
--- a/qmake/generators/metamakefile.h
+++ b/qmake/generators/metamakefile.h
@@ -62,7 +62,7 @@ public:
 
     virtual ~MetaMakefileGenerator();
 
-    static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true, bool *success = 0);
+    static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true);
     static MakefileGenerator *createMakefileGenerator(QMakeProject *proj, bool noIO = false);
 
     inline QMakeProject *projectFile() const { return project; }
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 8117a4c..73fdda9 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -168,10 +168,7 @@ int runQMake(int argc, char **argv)
                 continue;
         }
 
-        bool success = true;
-        MetaMakefileGenerator *mkfile = MetaMakefileGenerator::createMetaGenerator(&project, QString(), false, &success);
-        if (!success)
-            exit_val = 3;
+        MetaMakefileGenerator *mkfile = MetaMakefileGenerator::createMetaGenerator(&project, QString(), false);
         if(mkfile && !mkfile->write(oldpwd)) {
             if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)
                 fprintf(stderr, "Unable to generate project file.\n");
-- 
cgit v0.12