1 files changed, 22 insertions, 46 deletions

diff --git a/src/gui/kernel/qinputdevice.cpp b/src/gui/kernel/qinputdevice.cpp
index 4327c363f6..f7b216dcf0 100644
--- a/src/gui/kernel/qinputdevice.cpp
+++ b/src/gui/kernel/qinputdevice.cpp
@@ -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
 
 #include "qinputdevice.h"
 #include "qinputdevice_p.h"
@@ -271,6 +235,13 @@ Q_CONSTINIT static QBasicMutex devicesMutex;
 /*!
     Returns a list of all registered input devices (keyboards and pointing devices).
 
+    \note The list of devices is not always complete on all platforms. So far,
+    the most-complete information is available on the \l {Qt for Linux/X11}{X11}
+    platform, at startup and in response to hot-plugging. Most other platforms
+    are only able to provide generic devices of various types, only after receiving
+    events from them; and most platforms do not tell Qt when a device is plugged in,
+    or when it is unplugged at runtime.
+
     \note The returned list cannot be used to add new devices. To add a simulated
     touch screen for an autotest, QTest::createTouchDevice() can be used.
     Platform plugins should call QWindowSystemInterface::registerInputDevice()
@@ -396,19 +367,24 @@ bool QInputDevice::operator==(const QInputDevice &other) const
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug debug, const QInputDevice *device)
 {
-    const QInputDevicePrivate *d = QInputDevicePrivate::get(device);
-    if (d->pointingDeviceType)
-        return operator<<(debug, static_cast<const QPointingDevice *>(device));
     QDebugStateSaver saver(debug);
     debug.nospace();
     debug.noquote();
+
     debug << "QInputDevice(";
-    if (device) {
-        debug << '"' << device->name() << "\", type=" << device->type()
-              << Qt::hex << ", ID=" << device->systemId() << ", seat='" << device->seatName() << "'";
-    } else {
-        debug << '0';
+    if (!device) {
+        debug << "0)";
+        return debug;
     }
+
+    const QInputDevicePrivate *d = QInputDevicePrivate::get(device);
+
+    if (d->pointingDeviceType)
+        return operator<<(debug, static_cast<const QPointingDevice *>(device));
+
+    debug << "QInputDevice(";
+    debug << '"' << device->name() << "\", type=" << device->type()
+          << ", ID=" << device->systemId() << ", seat='" << device->seatName() << "'";
     debug << ')';
     return debug;
 }