1 files changed, 7 insertions, 43 deletions

diff --git a/src/gui/kernel/qinputdevice_p.h b/src/gui/kernel/qinputdevice_p.h
index 7f834adb9f..7f6ee258be 100644
--- a/src/gui/kernel/qinputdevice_p.h
+++ b/src/gui/kernel/qinputdevice_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui 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) 2020 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 QINPUTDEVICE_P_H
 #define QINPUTDEVICE_P_H
@@ -65,7 +29,7 @@ public:
                         QInputDevice::Capabilities caps = QInputDevice::Capability::None,
                         const QString &seatName = QString())
       : name(name), seatName(seatName), systemId(winSysId), capabilities(caps),
-        deviceType(type), pointingDeviceType(false)
+        deviceType(type)
     {
         // if the platform doesn't provide device IDs, make one up,
         // but try to avoid clashing with OS-provided 32-bit IDs
@@ -73,17 +37,17 @@ public:
         if (!systemId)
             systemId = nextId++;
     }
+    ~QInputDevicePrivate() override;
 
     QString name;
     QString seatName;
     QString busId;
     QRect availableVirtualGeometry;
-    void *extra = nullptr;      // The QPA plugin can store arbitrary device-specific data here
     void *qqExtra = nullptr;    // Qt Quick can store arbitrary device-specific data here
     qint64 systemId = 0;
-    qint32 capabilities = static_cast<qint32>(QInputDevice::Capability::None);
+    QInputDevice::Capabilities capabilities = QInputDevice::Capability::None;
     QInputDevice::DeviceType deviceType = QInputDevice::DeviceType::Unknown;
-    qint16 pointingDeviceType : 1; // actually bool, but pack with deviceType
+    bool pointingDeviceType = false;
 
     static void registerDevice(const QInputDevice *dev);
     static void unregisterDevice(const QInputDevice *dev);
@@ -96,7 +60,7 @@ public:
             return;
 
         availableVirtualGeometry = a;
-        capabilities |= qint32(QInputDevice::Capability::NormalizedPosition);
+        capabilities |= QInputDevice::Capability::NormalizedPosition;
         Q_Q(QInputDevice);
         Q_EMIT q->availableVirtualGeometryChanged(availableVirtualGeometry);
     }