diff options
Diffstat (limited to 'src/corelib/global/qt_windows.h')
| -rw-r--r-- | src/corelib/global/qt_windows.h | 69 |
1 files changed, 13 insertions, 56 deletions
diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h index 67ba27f072..5586d0b927 100644 --- a/src/corelib/global/qt_windows.h +++ b/src/corelib/global/qt_windows.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QT_WINDOWS_H #define QT_WINDOWS_H @@ -45,17 +9,17 @@ #pragma qt_sync_stop_processing #endif -#if defined(Q_CC_MINGW) -// mingw's windows.h does not set _WIN32_WINNT, resulting breaking compilation -# ifndef WINVER -# define WINVER 0x601 -# endif -# ifndef _WIN32_WINNT -# define _WIN32_WINNT 0x601 -# endif -# ifndef NTDDI_VERSION -# define NTDDI_VERSION 0x06000000 -# endif +#ifndef WINVER +# define WINVER 0x0A00 // _WIN32_WINNT_WIN10 +#endif +#ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0A00 +#endif +#ifndef _WIN32_IE +# define _WIN32_IE 0x0A00 +#endif +#ifndef NTDDI_VERSION +# define NTDDI_VERSION 0x0A00000C // NTDDI_WIN10_NI #endif #ifndef NOMINMAX @@ -63,13 +27,6 @@ #endif #include <windows.h> -#if defined(_WIN32_IE) && _WIN32_IE < 0x0501 -# undef _WIN32_IE -#endif -#if !defined(_WIN32_IE) -# define _WIN32_IE 0x0501 -#endif - // already defined when compiled with WINVER >= 0x0500 #ifndef SPI_SETMENUANIMATION #define SPI_SETMENUANIMATION 0x1003 |