diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:16:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:16:25 +0200 |
| commit | d148019f16e3c95916731e59e0324e7c470cc1fc (patch) | |
| tree | d9c0640c9055f24379468b8f55b3419f30a37c47 /tools/configure/environment.h | |
| parent | 8ceab12814a7437a01d917c83ec28fd6e81c459e (diff) | |
| parent | 6b9c57f8cd3df65702db327616913fa9d8172237 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074
Diffstat (limited to 'tools/configure/environment.h')
| -rw-r--r-- | tools/configure/environment.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/environment.h b/tools/configure/environment.h index 893e33c76f..344404505e 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -52,6 +52,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); |