summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-07-02 13:48:08 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-04 12:54:58 +0200
commitf1cdd4b2976706c6d9c3166a75afff6ec5856f3d (patch)
tree00191db57cd88ad0a6e6cedd934256e491e697bd /tools/configure/configureapp.cpp
parent55bf01828a36ff6b32c7164a08eebcda7fb1cc7d (diff)
add support for Visual Studio 2013
Add mkspec win32-msvc2013 and make VS 2013 known to configure and qmake. Change-Id: I6e63a4d679727a8a3f068f377956185996d72bce Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.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 4e70c11034..349281dd1e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1341,7 +1341,8 @@ void Configure::parseCmdLine()
dictionary[ "QMAKESPEC" ].endsWith("-msvc2005") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc2008") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc2010") ||
- dictionary[ "QMAKESPEC" ].endsWith("-msvc2012")) {
+ dictionary[ "QMAKESPEC" ].endsWith("-msvc2012") ||
+ dictionary[ "QMAKESPEC" ].endsWith("-msvc2013")) {
if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake";
dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
} else if (dictionary[ "QMAKESPEC" ] == QString("win32-g++")) {