From e88ba1159fe3e5bc2b8f9853edc9c2c742af7858 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Tue, 15 Sep 2020 13:14:22 +0200 Subject: rename win32-arm64-msvc2017 to win32-arm64-msvc The mkspec works with msvc 2019 as well. As 2017 is no longer supported, we should reflect this reality in the mkspecs naming. Change-Id: Ib1165343d43fd50eebc5e4e598e653ddc4a9b1ab Reviewed-by: Joerg Bornemann --- mkspecs/win32-arm64-msvc/qmake.conf | 15 +++++++++++ mkspecs/win32-arm64-msvc/qplatformdefs.h | 40 ++++++++++++++++++++++++++++ mkspecs/win32-arm64-msvc2017/qmake.conf | 15 ----------- mkspecs/win32-arm64-msvc2017/qplatformdefs.h | 40 ---------------------------- 4 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 mkspecs/win32-arm64-msvc/qmake.conf create mode 100644 mkspecs/win32-arm64-msvc/qplatformdefs.h delete mode 100644 mkspecs/win32-arm64-msvc2017/qmake.conf delete mode 100644 mkspecs/win32-arm64-msvc2017/qplatformdefs.h (limited to 'mkspecs') diff --git a/mkspecs/win32-arm64-msvc/qmake.conf b/mkspecs/win32-arm64-msvc/qmake.conf new file mode 100644 index 0000000000..483bfa5e51 --- /dev/null +++ b/mkspecs/win32-arm64-msvc/qmake.conf @@ -0,0 +1,15 @@ +# +# qmake configuration for win32-arm64-msvc +# +# Written for Microsoft C/C++ Optimizing Compiler targeting arm64. +# + +include(../common/msvc-desktop.conf) + +WINSDK_VER = 10.0 +VCPROJ_ARCH = ARM64 + +DEFINES += WIN64 +QMAKE_COMPILER_DEFINES += _WIN64 + +load(qt_config) diff --git a/mkspecs/win32-arm64-msvc/qplatformdefs.h b/mkspecs/win32-arm64-msvc/qplatformdefs.h new file mode 100644 index 0000000000..8a3afa7630 --- /dev/null +++ b/mkspecs/win32-arm64-msvc/qplatformdefs.h @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#include "../win32-msvc/qplatformdefs.h" diff --git a/mkspecs/win32-arm64-msvc2017/qmake.conf b/mkspecs/win32-arm64-msvc2017/qmake.conf deleted file mode 100644 index ee10f9cc40..0000000000 --- a/mkspecs/win32-arm64-msvc2017/qmake.conf +++ /dev/null @@ -1,15 +0,0 @@ -# -# qmake configuration for win32-arm64-msvc2017 -# -# Written for Microsoft C/C++ Optimizing Compiler targeting arm64. -# - -include(../common/msvc-desktop.conf) - -WINSDK_VER = 10.0 -VCPROJ_ARCH = ARM64 - -DEFINES += WIN64 -QMAKE_COMPILER_DEFINES += _WIN64 - -load(qt_config) diff --git a/mkspecs/win32-arm64-msvc2017/qplatformdefs.h b/mkspecs/win32-arm64-msvc2017/qplatformdefs.h deleted file mode 100644 index 8a3afa7630..0000000000 --- a/mkspecs/win32-arm64-msvc2017/qplatformdefs.h +++ /dev/null @@ -1,40 +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$ -** -****************************************************************************/ - -#include "../win32-msvc/qplatformdefs.h" -- cgit v1.2.3