summaryrefslogtreecommitdiffstats
path: root/tools/configure/environment.h
diff options
context:
space:
mode:
Diffstat (limited to 'tools/configure/environment.h')
-rw-r--r--tools/configure/environment.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/configure/environment.h b/tools/configure/environment.h
index d14961b5ac..8415fa10a6 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -33,7 +33,6 @@ QT_BEGIN_NAMESPACE
enum Compiler {
CC_UNKNOWN = 0,
- CC_BORLAND = 0x01,
CC_MINGW = 0x02,
CC_INTEL = 0x03,
CC_MSVC2005 = 0x80,
@@ -41,7 +40,8 @@ enum Compiler {
CC_MSVC2010 = 0xA0,
CC_MSVC2012 = 0xB0,
CC_MSVC2013 = 0xC0,
- CC_MSVC2015 = 0xD0
+ CC_MSVC2015 = 0xD0,
+ CC_MSVC2017 = 0xE0
};
struct CompilerInfo;
@@ -52,7 +52,6 @@ public:
static QString detectQMakeSpec();
static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv);
- static QString execute(const QString &command, int *returnCode = 0);
private:
static Compiler detectedCompiler;