1 files changed, 13 insertions, 42 deletions

diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h
index b5449b4a45..c271207741 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.h
+++ b/src/plugins/platforms/windows/qwindowsintegration.h
@@ -1,42 +1,6 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Samuel Gaist <samuel.gaist@edeltech.ch>
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins 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) 2013 Samuel Gaist <samuel.gaist@edeltech.ch>
+// 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 QWINDOWSINTEGRATION_H
 #define QWINDOWSINTEGRATION_H
@@ -46,7 +10,9 @@
 #include <qpa/qplatformintegration.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtGui/private/qwindowsfontdatabase_p.h>
+#ifndef QT_NO_OPENGL
 #include <QtGui/private/qopenglcontext_p.h>
+#endif
 #include <qpa/qplatformopenglcontext.h>
 
 QT_BEGIN_NAMESPACE
@@ -79,7 +45,7 @@ public:
         DontUseWMPointer = 0x400,
         DetectAltGrModifier = 0x800,
         RtlEnabled = 0x1000,
-        FontDatabaseDirectWrite = 0x2000
+        FontDatabaseGDI = 0x2000
     };
 
     explicit QWindowsIntegration(const QStringList &paramList);
@@ -116,8 +82,7 @@ public:
     QPlatformServices *services() const override;
     QVariant styleHint(StyleHint hint) const override;
 
-    Qt::KeyboardModifiers queryKeyboardModifiers() const override;
-    QList<int> possibleKeys(const QKeyEvent *e) const override;
+    QPlatformKeyMapper *keyMapper() const override;
 
     static QWindowsIntegration *instance() { return m_instance; }
 
@@ -125,6 +90,10 @@ public:
 
     void beep() const override;
 
+    void setApplicationBadge(qint64 number) override;
+    void setApplicationBadge(const QImage &image);
+    void updateApplicationBadge();
+
 #if QT_CONFIG(sessionmanager)
     QPlatformSessionManager *createPlatformSessionManager(const QString &id, const QString &key) const override;
 #endif
@@ -140,6 +109,8 @@ private:
     QScopedPointer<QWindowsIntegrationPrivate> d;
 
     static QWindowsIntegration *m_instance;
+
+    qint64 m_applicationBadgeNumber = 0;
 };
 
 QT_END_NAMESPACE