summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.cpp
diff options
context:
space:
mode:
authorAndreas Holzammer <andreas.holzammer@kdab.com>2012-05-16 08:50:55 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-16 13:34:20 +0200
commit1a4f58d3e67f3d271d9e24d7f52950f796542d2f (patch)
treec1bebce5a9fa437a8db40722488c757b36675bd8 /tools/configure/configureapp.cpp
parent078ba2d0a202c3058c39db75921f401e5f2c4d0a (diff)
Add Visual Studio 11 mkspec
This adds the Visual Studio 11 mkspec and the corresponding changes to configure and qmake makesystem. Change-Id: I3a7e82a6f7f90aa0a94dedd493ebaa66bf100923 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r--tools/configure/configureapp.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ef41f4ae80..b9040d62f1 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1115,7 +1115,8 @@ void Configure::parseCmdLine()
dictionary[ "QMAKESPEC" ].endsWith("-msvc2003") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc2005") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc2008") ||
- dictionary[ "QMAKESPEC" ].endsWith("-msvc2010")) {
+ dictionary[ "QMAKESPEC" ].endsWith("-msvc2010") ||
+ dictionary[ "QMAKESPEC" ].endsWith("-msvc11")) {
if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake";
dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
} else if (dictionary[ "QMAKESPEC" ] == QString("win32-g++")) {