diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-03-25 09:58:39 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-04-09 08:53:34 (GMT) |
| commit | 51e706b1899b3e59f7789bf94184643ccfabeebd (patch) | |
| tree | 9e6b6018a0a704e526c014eeacaf91f8a1b13341 /tools/configure/configureapp.cpp | |
| parent | 716fbaef34386c8b05d7d63894a5bc116ddd1b6c (diff) | |
| download | Qt-51e706b1899b3e59f7789bf94184643ccfabeebd.zip Qt-51e706b1899b3e59f7789bf94184643ccfabeebd.tar.gz Qt-51e706b1899b3e59f7789bf94184643ccfabeebd.tar.bz2 | |
Add detection of and support for Visual Studio 2015
Backport of qtbase/ce1c53b4.
Task-number: QTBUG-45100
Change-Id: I10db5cfca9976bc37e86b415c2b6e10f51ec5eeb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 2 insertions, 1 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++")) { |