Merge all "win32-msvc*" mkspecs into one

Since we can tell the MSVC version from the compiler now, each of the
qmake.conf files is now the same, so let's just have "win32-msvc" and be
future-proof. Likewise for win32-clang-msvc.

qplatformdefs.h was already common.

Since we can't obtain the MSVC version from the unified mkspec name any
more, I dropped the warning level during the qmake bootstrap to reduce
the number of warnings that need to be disabled from compiler version to
version.

There is no point in keeping the old mkspecs, but configure will re-map
the -platform argument to the unified spec as necessary, to keep
existing configure command lines working.

[ChangeLog][Visual Studio] Qt now has a common mkspec for all Visual
Studio versions, called "win32-msvc". The old names which contained the
version number are now gone (but qmake scopes based on the old names
continue to work). The version of the compiler can be obtained from the
MSC_VER and MSVC_VER variables (for example, for Visual Studio 2015,
those contain the values 1900 and 14.0, respectively). Those variables
are also available with the Intel compiler (win32-icc) and with Clang
(win32-clang-msvc).

Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: Ib57b52598e2f452985e9fffd14587c0a77a5c09c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

2 files changed, 0 insertions, 148 deletions

diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
deleted file mode 100644
index 3fbf797b5b..0000000000
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# qmake configuration for win32-msvc2005
-#
-# Written for Microsoft Visual C++ 2005
-#
-
-include(../common/msvc-desktop.conf)
-load(qt_config)
diff --git a/mkspecs/win32-msvc2005/qplatformdefs.h b/mkspecs/win32-msvc2005/qplatformdefs.h
deleted file mode 100644
index 9573d18a40..0000000000
--- a/mkspecs/win32-msvc2005/qplatformdefs.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-#ifdef UNICODE
-#ifndef _UNICODE
-#define _UNICODE
-#endif
-#endif
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-#define _POSIX_
-#include <limits.h>
-#undef _POSIX_
-
-#include <tchar.h>
-#include <io.h>
-#include <direct.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_STATBUF              struct _stati64         // non-ANSI defs
-#define QT_STATBUF4TSTAT        struct _stati64         // non-ANSI defs
-#define QT_STAT                 ::_stati64
-#define QT_FSTAT                ::_fstati64
-#else
-#define QT_STATBUF              struct _stat            // non-ANSI defs
-#define QT_STATBUF4TSTAT        struct _stat            // non-ANSI defs
-#define QT_STAT                 ::_stat
-#define QT_FSTAT                ::_fstat
-#endif
-#define QT_STAT_REG             _S_IFREG
-#define QT_STAT_DIR             _S_IFDIR
-#define QT_STAT_MASK            _S_IFMT
-#if defined(_S_IFLNK)
-#  define QT_STAT_LNK           _S_IFLNK
-#else
-#  define QT_STAT_LNK           0120000
-#endif
-#define QT_FILENO               _fileno
-#define QT_OPEN                 ::_open
-#define QT_CLOSE                ::_close
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_LSEEK                ::_lseeki64
-#define QT_TSTAT                ::_tstati64
-#else
-#define QT_LSEEK                ::_lseek
-#define QT_TSTAT                ::_tstat
-#endif
-#define QT_READ                 ::_read
-#define QT_WRITE                ::_write
-#define QT_ACCESS               ::_access
-#define QT_GETCWD               ::_getcwd
-#define QT_CHDIR                ::_chdir
-#define QT_MKDIR                ::_mkdir
-#define QT_RMDIR                ::_rmdir
-#define QT_OPEN_LARGEFILE       0
-#define QT_OPEN_RDONLY          _O_RDONLY
-#define QT_OPEN_WRONLY          _O_WRONLY
-#define QT_OPEN_RDWR            _O_RDWR
-#define QT_OPEN_CREAT           _O_CREAT
-#define QT_OPEN_TRUNC           _O_TRUNC
-#define QT_OPEN_APPEND          _O_APPEND
-#if defined(O_TEXT)
-# define QT_OPEN_TEXT           _O_TEXT
-# define QT_OPEN_BINARY         _O_BINARY
-#endif
-
-#include "../common/c89/qplatformdefs.h"
-
-#ifdef QT_LARGEFILE_SUPPORT
-#undef QT_FSEEK
-#undef QT_FTELL
-#undef QT_OFF_T
-
-#define QT_FSEEK                ::_fseeki64
-#define QT_FTELL                ::_ftelli64
-#define QT_OFF_T                __int64
-#endif
-
-#define QT_SIGNAL_ARGS          int
-
-#define QT_VSNPRINTF(buffer, count, format, arg) \
-    vsnprintf_s(buffer, count, count-1, format, arg)
-
-#define QT_SNPRINTF             ::_snprintf
-
-# define F_OK   0
-# define X_OK   1
-# define W_OK   2
-# define R_OK   4
-
-typedef int mode_t;
-
-#endif // QPLATFORMDEFS_H