From 75e0d1b5c193cb1d421c44ef2be04d5f43739a91 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 9 Jul 2015 15:20:59 -0700
Subject: Make sure all qtbase private headers include at least one other

See script in qtbase/util/includeprivate for the rules.

Since these files are being touched anyway, I also ran the
updatecopyright.pl script too.

Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
---
 src/platformsupport/devicediscovery/qdevicediscovery_p.h              | 3 ++-
 src/platformsupport/fbconvenience/qfbbackingstore_p.h                 | 1 +
 src/platformsupport/fbconvenience/qfbwindow_p.h                       | 1 +
 src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h | 1 +
 src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h     | 3 ++-
 src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h           | 3 ++-
 src/platformsupport/input/evdevtouch/qevdevtouchfilter_p.h            | 2 +-
 src/platformsupport/input/libinput/qlibinputhandler_p.h               | 1 +
 src/platformsupport/input/libinput/qlibinputpointer_p.h               | 1 +
 src/platformsupport/input/libinput/qlibinputtouch_p.h                 | 3 ++-
 src/platformsupport/input/shared/devicehandlerlist_p.h                | 1 +
 src/platformsupport/input/shared/qevdevutil_p.h                       | 1 +
 src/platformsupport/input/shared/qoutputmapping_p.h                   | 1 +
 src/platformsupport/input/tslib/qtslib_p.h                            | 3 ++-
 14 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_p.h
index f1f50e9708..5eefba9dfa 100644
--- a/src/platformsupport/devicediscovery/qdevicediscovery_p.h
+++ b/src/platformsupport/devicediscovery/qdevicediscovery_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -54,6 +54,7 @@
 #include <QObject>
 #include <QSocketNotifier>
 #include <QStringList>
+#include <private/qglobal_p.h>
 
 #define QT_EVDEV_DEVICE_PATH "/dev/input/"
 #define QT_EVDEV_DEVICE_PREFIX "event"
diff --git a/src/platformsupport/fbconvenience/qfbbackingstore_p.h b/src/platformsupport/fbconvenience/qfbbackingstore_p.h
index c4762c9327..88dddd080a 100644
--- a/src/platformsupport/fbconvenience/qfbbackingstore_p.h
+++ b/src/platformsupport/fbconvenience/qfbbackingstore_p.h
@@ -53,6 +53,7 @@
 
 #include <qpa/qplatformbackingstore.h>
 #include <QtCore/QMutex>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/platformsupport/fbconvenience/qfbwindow_p.h b/src/platformsupport/fbconvenience/qfbwindow_p.h
index 76b34ce041..0b08e0bd01 100644
--- a/src/platformsupport/fbconvenience/qfbwindow_p.h
+++ b/src/platformsupport/fbconvenience/qfbwindow_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <qpa/qplatformwindow.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
index 17bf0fb797..bfce2792ec 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
@@ -52,6 +52,7 @@
 //
 
 #include "qnamespace.h"
+#include "private/qglobal_p.h"
 #ifdef Q_OS_FREEBSD
 #include <dev/evdev/input.h>
 #else
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
index 24ed1b64a8..7a47a7dd59 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -54,6 +54,7 @@
 #include <qobject.h>
 #include <QTimer>
 #include <QDataStream>
+#include <private/qglobal_p.h>
 
 #include <memory>
 
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
index 8fcf49200b..350164a1c0 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
+++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** 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.
@@ -55,6 +55,7 @@
 #include <QString>
 #include <QPoint>
 #include <QEvent>
+#include <private/qglobal_p.h>
 
 #include <memory>
 
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchfilter_p.h b/src/platformsupport/input/evdevtouch/qevdevtouchfilter_p.h
index ff6085d725..cc00474f95 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchfilter_p.h
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchfilter_p.h
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 
 //
 //  W A R N I N G
diff --git a/src/platformsupport/input/libinput/qlibinputhandler_p.h b/src/platformsupport/input/libinput/qlibinputhandler_p.h
index ac7a267a4d..d9a65d5ff6 100644
--- a/src/platformsupport/input/libinput/qlibinputhandler_p.h
+++ b/src/platformsupport/input/libinput/qlibinputhandler_p.h
@@ -43,6 +43,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
 #include <QtCore/QMap>
+#include <QtCore/private/qglobal_p.h>
 
 //
 //  W A R N I N G
diff --git a/src/platformsupport/input/libinput/qlibinputpointer_p.h b/src/platformsupport/input/libinput/qlibinputpointer_p.h
index 55d4a5f919..3c41e2d09a 100644
--- a/src/platformsupport/input/libinput/qlibinputpointer_p.h
+++ b/src/platformsupport/input/libinput/qlibinputpointer_p.h
@@ -41,6 +41,7 @@
 #define QLIBINPUTPOINTER_P_H
 
 #include <QtCore/QPoint>
+#include <QtCore/private/qglobal_p.h>
 
 //
 //  W A R N I N G
diff --git a/src/platformsupport/input/libinput/qlibinputtouch_p.h b/src/platformsupport/input/libinput/qlibinputtouch_p.h
index 67c20b9af6..431fd320fa 100644
--- a/src/platformsupport/input/libinput/qlibinputtouch_p.h
+++ b/src/platformsupport/input/libinput/qlibinputtouch_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins module of the Qt Toolkit.
@@ -44,6 +44,7 @@
 #include <QtCore/QList>
 #include <QtCore/QPointer>
 #include <qpa/qwindowsysteminterface.h>
+#include <private/qglobal_p.h>
 
 //
 //  W A R N I N G
diff --git a/src/platformsupport/input/shared/devicehandlerlist_p.h b/src/platformsupport/input/shared/devicehandlerlist_p.h
index 97794d4d7d..53f4c66505 100644
--- a/src/platformsupport/input/shared/devicehandlerlist_p.h
+++ b/src/platformsupport/input/shared/devicehandlerlist_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <QString>
+#include <private/qglobal_p.h>
 
 #include <vector>
 #include <memory>
diff --git a/src/platformsupport/input/shared/qevdevutil_p.h b/src/platformsupport/input/shared/qevdevutil_p.h
index 7b5b0f52d1..0ac4b26197 100644
--- a/src/platformsupport/input/shared/qevdevutil_p.h
+++ b/src/platformsupport/input/shared/qevdevutil_p.h
@@ -55,6 +55,7 @@
 #include <QString>
 #include <QStringList>
 #include <QStringView>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/platformsupport/input/shared/qoutputmapping_p.h b/src/platformsupport/input/shared/qoutputmapping_p.h
index 5376672eff..46c1e7eb2b 100644
--- a/src/platformsupport/input/shared/qoutputmapping_p.h
+++ b/src/platformsupport/input/shared/qoutputmapping_p.h
@@ -53,6 +53,7 @@
 
 #include <QString>
 #include <QHash>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/platformsupport/input/tslib/qtslib_p.h b/src/platformsupport/input/tslib/qtslib_p.h
index b49531ebd3..ce3a59dc28 100644
--- a/src/platformsupport/input/tslib/qtslib_p.h
+++ b/src/platformsupport/input/tslib/qtslib_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include <QObject>
+#include <private/qglobal_p.h>
 
 struct tsdev;
 
-- 
cgit v1.2.3