From 0c6568af0b52838fdc9fa1126ec56e3d82eedfa5 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 10 Aug 2010 13:09:44 +0200
Subject: [PATCH] Quiten debug messages
* Simplify logic while at it, too.
---
src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
index 39dfd43a2b5..d5128e2db06 100644
--- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
@@ -167,7 +167,7 @@ QString GCCEToolChain::gcceVersion() const
return QString();
QProcess gxx;
QStringList arguments;
- arguments << QLatin1String("--version");
+ arguments << QLatin1String("-dumpversion");
ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
env.set(QLatin1String("LC_ALL"), QLatin1String("C")); //override current locale settings
gxx.setEnvironment(env.toStringList());
@@ -179,12 +179,7 @@ QString GCCEToolChain::gcceVersion() const
QString line;
if (gxx.canReadLine()) {
line = gxx.readLine();
- qDebug() << "GCCVersion:" << line;
- QRegExp version("\\s((\\d+)\\.(\\d+)\\.(\\d+))\\s");
- if (line.indexOf(version) >= -1) {
- qDebug() << " MATCHED!";
- m_gcceVersion = version.cap(1);
- }
+ m_gcceVersion = line.trimmed();
}
}
return m_gcceVersion;
--
GitLab