diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-19 15:52:49 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-13 05:11:25 +0100 |
| commit | ce1c53b4130495b17addc45bf3f5b2a2dc052507 (patch) | |
| tree | 7d964a0391a022fe99a0ee87b5547de8359f3aa7 /mkspecs/win32-msvc2015 | |
| parent | c23d1c76953704ecb52c833d7ef1de2e2f89b1e6 (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')
| -rw-r--r-- | mkspecs/win32-msvc2015/qmake.conf | 11 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2015/qplatformdefs.h | 34 |
2 files changed, 45 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) diff --git a/mkspecs/win32-msvc2015/qplatformdefs.h b/mkspecs/win32-msvc2015/qplatformdefs.h new file mode 100644 index 0000000000..feb5ba5b80 --- /dev/null +++ b/mkspecs/win32-msvc2015/qplatformdefs.h @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the qmake spec of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "../win32-msvc2005/qplatformdefs.h" |