summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-msvc2015/qmake.conf
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-06-19 15:52:49 -0700
committerThiago Macieira <thiago.macieira@intel.com>2014-12-13 05:11:25 +0100
commitce1c53b4130495b17addc45bf3f5b2a2dc052507 (patch)
tree7d964a0391a022fe99a0ee87b5547de8359f3aa7 /mkspecs/win32-msvc2015/qmake.conf
parentc23d1c76953704ecb52c833d7ef1de2e2f89b1e6 (diff)
Add detection of and support for Visual Studio 2015
Tested with the Preview release of November 2014. Differences to the 2013 detection and support: - Option -Zc:strictStrings is present in both debug and release mode and is passed to qmake's own build - New warnings 4456, 4457 and 4458 (shadowing) are disabled - Compiler supports -arch:AVX2 Change-Id: I9572ff4d4aded4004c1fa5d6f13ffee5462043d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs/win32-msvc2015/qmake.conf')
-rw-r--r--mkspecs/win32-msvc2015/qmake.conf11
1 files changed, 11 insertions, 0 deletions
diff --git a/mkspecs/win32-msvc2015/qmake.conf b/mkspecs/win32-msvc2015/qmake.conf
new file mode 100644
index 0000000000..617adb681c
--- /dev/null
+++ b/mkspecs/win32-msvc2015/qmake.conf
@@ -0,0 +1,11 @@
+#
+# qmake configuration for win32-msvc2015
+#
+# Written for Microsoft Visual C++ 2015
+#
+
+MSC_VER = 1900
+MSVC_VER = 14.0
+include(../common/msvc-desktop.conf)
+include(../common/shell-win32.conf)
+load(qt_config)