From 74602f3119d3fa1ebd81fb8e485918eb3f9bee66 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 17 Aug 2009 11:49:59 +0200
Subject: [PATCH] Remove debugging output, running qmake works for most people.

---
 src/plugins/qt4projectmanager/qt4project.cpp  | 10 +++--
 .../qt4projectmanager/qtversionmanager.cpp    | 42 +++++++++++--------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 7629c451d58..bf1d59b90cd 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -1195,10 +1195,12 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(const QString &buildConfi
                 parsedSpec = parsedSpec.toLower();
 #endif
 
-                qDebug()<<"Actual args:"<<actualArgs;
-                qDebug()<<"Parsed args:"<<parsedArgs;
-                qDebug()<<"Actual spec:"<<actualSpec;
-                qDebug()<<"Parsed spec:"<<parsedSpec;
+                if (debug) {
+                    qDebug()<<"Actual args:"<<actualArgs;
+                    qDebug()<<"Parsed args:"<<parsedArgs;
+                    qDebug()<<"Actual spec:"<<actualSpec;
+                    qDebug()<<"Parsed spec:"<<parsedSpec;
+                }
 
                 if (actualArgs == parsedArgs && actualSpec == parsedSpec)
                     return true;
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index f2e411a3b63..edb77179b2a 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -68,6 +68,8 @@ static const char *defaultQtVersionKey = "DefaultQtVersion";
 static const char *newQtVersionsKey = "NewQtVersions";
 static const char *PATH_AUTODETECTION_SOURCE = "PATH";
 
+enum { debug = 0 };
+
 QtVersionManager *QtVersionManager::m_self = 0;
 
 QtVersionManager::QtVersionManager()
@@ -551,29 +553,32 @@ void dumpQMakeAssignments(const QList<QMakeAssignment> &list)
     }
 }
 
-// New code
 QPair<QtVersion::QmakeBuildConfig, QStringList> QtVersionManager::scanMakeFile(const QString &directory, QtVersion::QmakeBuildConfig defaultBuildConfig)
 {
-    qDebug()<<"ScanMakeFile, the gory details:";
+    if (debug)
+        qDebug()<<"ScanMakeFile, the gory details:";
     QtVersion::QmakeBuildConfig result = QtVersion::NoBuild;
     QStringList result2;
 
     QString line = findQMakeLine(directory);
     if (!line.isEmpty()) {
-        qDebug()<<"Found line"<<line;
+        if (debug)
+            qDebug()<<"Found line"<<line;
         line = trimLine(line);
-        qDebug()<<"Trimmed to"<<line;
         QStringList parts = splitLine(line);
-        qDebug()<<"Splitted into"<<parts;
+        if (debug)
+            qDebug()<<"Splitted into"<<parts;
         QList<QMakeAssignment> assignments;
         QList<QMakeAssignment> afterAssignments;
         QStringList additionalArguments;
         parseParts(parts, &assignments, &afterAssignments, &additionalArguments);
 
-        dumpQMakeAssignments(assignments);
-        if (!afterAssignments.isEmpty())
-            qDebug()<<"-after";
-        dumpQMakeAssignments(afterAssignments);
+        if (debug) {
+            dumpQMakeAssignments(assignments);
+            if (!afterAssignments.isEmpty())
+                qDebug()<<"-after";
+            dumpQMakeAssignments(afterAssignments);
+        }
 
         // Search in assignments for CONFIG(+=,-=,=)(debug,release,debug_and_release)
         // Also remove them from the list
@@ -592,14 +597,16 @@ QPair<QtVersion::QmakeBuildConfig, QStringList> QtVersionManager::scanMakeFile(c
     }
 
     // Dump the gathered information:
-    qDebug()<<"\n\nDumping information from scanMakeFile";
-    qDebug()<<"QMake CONFIG variable parsing";
-    qDebug()<<"  "<< (result & QtVersion::NoBuild ? "No Build" : QString::number(int(result)));
-    qDebug()<<"  "<< (result & QtVersion::DebugBuild ? "debug" : "release");
-    qDebug()<<"  "<< (result & QtVersion::BuildAll ? "debug_and_release" : "no debug_and_release");
-    qDebug()<<"\nAddtional Arguments";
-    qDebug()<<result2;
-    qDebug()<<"\n\n";
+    if (debug) {
+        qDebug()<<"\n\nDumping information from scanMakeFile";
+        qDebug()<<"QMake CONFIG variable parsing";
+        qDebug()<<"  "<< (result & QtVersion::NoBuild ? "No Build" : QString::number(int(result)));
+        qDebug()<<"  "<< (result & QtVersion::DebugBuild ? "debug" : "release");
+        qDebug()<<"  "<< (result & QtVersion::BuildAll ? "debug_and_release" : "no debug_and_release");
+        qDebug()<<"\nAddtional Arguments";
+        qDebug()<<result2;
+        qDebug()<<"\n\n";
+    }
     return qMakePair(result, result2);
 }
 
@@ -690,7 +697,6 @@ void QtVersionManager::parseParts(const QStringList &parts, QList<QMakeAssignmen
         } else if (part == "-o") {
             ignoreNext = true;
         } else {
-            qDebug()<<"Not parsed"<<part;
             additionalArguments->append(part);
         }
     }