summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-02-07 12:42:54 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-11 10:30:30 +0100
commit95f256d21dd4e7683a1476a572d121a30fb929ba (patch)
treec3f1a5fa5ca8435b7ce83d9e924dc464b39405fc
parent51f77e9e8eafa17de68153220685bf4961072aa3 (diff)
Remove incorrect check for mingw 64 bit
MinGW-w64 has '64' too, but isn't necessarily a 64 bit build ... But the variable wasn't used anyway, so we can as well just remove the check. Change-Id: Ifba3ce344c5dc5e692f105bc99081ae4c69c779c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--tools/configure/environment.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 0c9c500691..1cdff475b5 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -199,8 +199,7 @@ Compiler Environment::detectCompiler()
++installed;
detectedCompiler = compiler_info[i].compiler;
if (detectedCompiler == CC_MINGW) {
- bool is64bit;
- const int version = detectGPlusPlusVersion(executable, &is64bit);
+ const int version = detectGPlusPlusVersion(executable);
if (version < 0x040600)
detectedCompiler = CC_MINGW_44;
}
@@ -257,21 +256,17 @@ bool Environment::detectExecutable(const QString &executable)
Determine the g++ version.
*/
-int Environment::detectGPlusPlusVersion(const QString &executable,
- bool *is64bit)
+int Environment::detectGPlusPlusVersion(const QString &executable)
{
QRegExp regexp(QLatin1String("[gG]\\+\\+[\\.exEX]{0,4} ([^\\n]+) (\\d+)\\.(\\d+)\\.(\\d+)"));
QString stdOut = readProcessStandardOutput(executable + QLatin1String(" --version"));
if (regexp.indexIn(stdOut) != -1) {
const QString compiler = regexp.cap(1);
- // Check for "tdm64-1"
- *is64bit = compiler.contains(QLatin1String("64"));
const int major = regexp.cap(2).toInt();
const int minor = regexp.cap(3).toInt();
const int patch = regexp.cap(4).toInt();
return (major << 16) + (minor << 8) + patch;
}
- *is64bit = false;
return 0;
}