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 /qmake/Makefile.win32 | |
| 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 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index d0b166e..d1d275c 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -1,4 +1,4 @@ -!IF "$(QMAKESPEC)" == "win32-msvc" || "$(QMAKESPEC)" == "win32-msvc.net" || "$(QMAKESPEC)" == "win32-msvc2002" || "$(QMAKESPEC)" == "win32-msvc2003" || "$(QMAKESPEC)" == "win32-msvc2005" || "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012" || "$(QMAKESPEC)" == "win32-msvc2013" || "$(QMAKESPEC)" == "win32-icc" +!IF "$(QMAKESPEC)" == "win32-msvc" || "$(QMAKESPEC)" == "win32-msvc.net" || "$(QMAKESPEC)" == "win32-msvc2002" || "$(QMAKESPEC)" == "win32-msvc2003" || "$(QMAKESPEC)" == "win32-msvc2005" || "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012" || "$(QMAKESPEC)" == "win32-msvc2013" || "$(QMAKESPEC)" == "win32-msvc2015" || "$(QMAKESPEC)" == "win32-icc" !if "$(SOURCE_PATH)" == "" SOURCE_PATH = .. |