summaryrefslogtreecommitdiffstats
path: root/tools/configure/environment.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2016-09-01 10:48:06 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2016-09-03 20:13:50 +0000
commit5971b88ecd08a81720c3556029cecd35b0cf2cb5 (patch)
treee294a449b2c9f486b7c7b9e5cc95fd4f93cec967 /tools/configure/environment.h
parent8d8c7b31bafc30328f0daa8c814623bc5643490e (diff)
configure.exe: Write MSVC compiler version to qconfig.pri
Backport a feature of the new configure system setting the variables QT_CL_MAJOR_VERSION, QT_CL_MINOR_VERSION, QT_CL_PATCH_VERSION similarly to the existing variables for gcc. This allows for disabling optimizations depending on the compiler version. Task-number: QTBUG-55238 Change-Id: If2349b008c1049e2ab98a5c1160b244a6e8937a8 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 927c3e294f..d096782e70 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -57,6 +57,7 @@ public:
static QString detectQMakeSpec();
static Compiler compilerFromQMakeSpec(const QString &qmakeSpec);
static QString gccVersion();
+ static QString msvcVersion();
static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv);
static QString execute(const QString &command, int *returnCode = 0);