summaryrefslogtreecommitdiffstats
path: root/tools/configure/environment.h
diff options
context:
space:
mode:
authorEric Lemanissier <eric.lemanissier@gmail.com>2015-03-04 12:58:28 +0100
committerEric Lemanissier <eric.lemanissier@gmail.com>2015-03-25 11:13:19 +0000
commitb814d05101bbc35354388d5e46bd13df9e4a663e (patch)
tree42d10929c7962772d564f713dbdc03d9d9acd8a3 /tools/configure/environment.h
parentb0c58c2bb4cde616302f98e4c64549ae2ae028cf (diff)
Add mingw GCC Version to qconfig.pri
This change adds missing variables in mkspecs/qconfig.pri about gcc compiler version when using mingw: QT_GCC_{MAJOR,MINOR,PATCH}_VERSION This is needed in case CONFIG += c++14 is used. Task-number: QTBUG-44142 Change-Id: I34c27f9154bb745a8ee75c777a0acbdbc5bda5a9 Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools/configure/environment.h')
-rw-r--r--tools/configure/environment.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/environment.h b/tools/configure/environment.h
index 669c356f34..927c3e294f 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -56,6 +56,7 @@ public:
static Compiler detectCompiler();
static QString detectQMakeSpec();
static Compiler compilerFromQMakeSpec(const QString &qmakeSpec);
+ static QString gccVersion();
static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv);
static QString execute(const QString &command, int *returnCode = 0);