3 files changed, 9 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 8c3b18f..9d5daf2 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1375,7 +1375,8 @@ void Configure::parseCmdLine()
             qmakeSpec.endsWith("-msvc2008") ||
             qmakeSpec.endsWith("-msvc2010") ||
             qmakeSpec.endsWith("-msvc2012") ||
-            qmakeSpec.endsWith("-msvc2013")) {
+            qmakeSpec.endsWith("-msvc2013") ||
+            qmakeSpec.endsWith("-msvc2015")) {
             if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake";
             dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
         } else if (qmakeSpec.contains("win32-g++")) {
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 0725389..7f4f1ad 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -84,6 +84,8 @@ struct CompilerInfo{
     {CC_NET2012, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2012 (11.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe
     {CC_NET2013, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2013 (12.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\12.0", "cl.exe"}, // link.exe, lib.exe
     {CC_NET2013, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2013 (12.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\12.0", "cl.exe"}, // link.exe, lib.exe
+    {CC_NET2015, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2015 (14.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\14.0", "cl.exe"}, // link.exe, lib.exe
+    {CC_NET2015, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2015 (14.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\14.0", "cl.exe"}, // link.exe, lib.exe
     {CC_UNKNOWN, "Unknown", 0, 0},
 };
 
@@ -109,6 +111,9 @@ QString Environment::detectQMakeSpec()
 {
     QString spec;
     switch (detectCompiler()) {
+    case CC_NET2015:
+        spec = "win32-msvc2015";
+        break;
     case CC_NET2013:
         spec = "win32-msvc2013";
         break;
diff --git a/tools/configure/environment.h b/tools/configure/environment.h
index cfb8a4f..9abbc8e 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -56,7 +56,8 @@ enum Compiler {
     CC_NET2008 = 0x90,
     CC_NET2010 = 0xA0,
     CC_NET2012 = 0xB0,
-    CC_NET2013 = 0xC0
+    CC_NET2013 = 0xC0,
+    CC_NET2015 = 0xD0
 };
 
 struct CompilerInfo;