From d3cafe31764fa4a7c4d70cbad74bba40de8073be Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Wed, 28 Sep 2022 14:01:42 +0200
Subject: Update header files to fit syncqt standards

Task-number: QTBUG-87480
Change-Id: I83fd8b53ef7ee4eb068f26e717b37cb2e52fe874
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/compositor/compositor_api/qwaylandbufferref.h          |  2 +-
 src/compositor/compositor_api/qwaylandclient.h             |  2 +-
 src/compositor/compositor_api/qwaylandcompositor.h         |  8 ++++----
 src/compositor/compositor_api/qwaylandinputmethodcontrol.h |  2 +-
 src/compositor/compositor_api/qwaylandoutput.h             |  6 ++----
 src/compositor/extensions/qwaylandpresentationtime_p.h     | 11 +++++++++++
 6 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/compositor/compositor_api/qwaylandbufferref.h b/src/compositor/compositor_api/qwaylandbufferref.h
index 60585dbe..a917726f 100644
--- a/src/compositor/compositor_api/qwaylandbufferref.h
+++ b/src/compositor/compositor_api/qwaylandbufferref.h
@@ -5,7 +5,7 @@
 #define QWAYLANDBUFFERREF_H
 
 #include <QtWaylandCompositor/qtwaylandcompositorglobal.h>
-#include <QImage>
+#include <QtGui/QImage>
 
 #if QT_CONFIG(opengl)
 #include <QtGui/qopengl.h>
diff --git a/src/compositor/compositor_api/qwaylandclient.h b/src/compositor/compositor_api/qwaylandclient.h
index eda4a023..3dae7069 100644
--- a/src/compositor/compositor_api/qwaylandclient.h
+++ b/src/compositor/compositor_api/qwaylandclient.h
@@ -7,7 +7,7 @@
 #include <QtWaylandCompositor/qtwaylandcompositorglobal.h>
 #include <QtWaylandCompositor/qtwaylandqmlinclude.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <signal.h>
 
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index dd9029c5..262dd588 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -9,10 +9,10 @@
 #include <QtWaylandCompositor/qwaylandcompositorextension.h>
 #include <QtWaylandCompositor/QWaylandOutput>
 
-#include <QObject>
-#include <QImage>
-#include <QRect>
-#include <QLoggingCategory>
+#include <QtCore/QObject>
+#include <QtGui/QImage>
+#include <QtCore/QRect>
+#include <QtCore/QLoggingCategory>
 
 struct wl_display;
 
diff --git a/src/compositor/compositor_api/qwaylandinputmethodcontrol.h b/src/compositor/compositor_api/qwaylandinputmethodcontrol.h
index 31ee7ff1..3b4d7487 100644
--- a/src/compositor/compositor_api/qwaylandinputmethodcontrol.h
+++ b/src/compositor/compositor_api/qwaylandinputmethodcontrol.h
@@ -5,7 +5,7 @@
 #define QWAYLANDINPUTMETHODCONTROL_H
 
 #include <QtGui/qtguiglobal.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h
index c00ec0f9..a45fa575 100644
--- a/src/compositor/compositor_api/qwaylandoutput.h
+++ b/src/compositor/compositor_api/qwaylandoutput.h
@@ -9,10 +9,8 @@
 #include <QtWaylandCompositor/qwaylandcompositorextension.h>
 #include <QtWaylandCompositor/QWaylandOutputMode>
 #include <QtCore/QObject>
-
-#include <QObject>
-#include <QRect>
-#include <QSize>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
 
 struct wl_resource;
 
diff --git a/src/compositor/extensions/qwaylandpresentationtime_p.h b/src/compositor/extensions/qwaylandpresentationtime_p.h
index 3b6d2837..7da82cbb 100644
--- a/src/compositor/extensions/qwaylandpresentationtime_p.h
+++ b/src/compositor/extensions/qwaylandpresentationtime_p.h
@@ -4,6 +4,17 @@
 #ifndef QWAYLANDPRESENTATIONTIME_P_H
 #define QWAYLANDPRESENTATIONTIME_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QObject>
 #include <QtWaylandCompositor/qwaylandcompositorextension.h>
 #include <QtCore/private/qglobal_p.h>
-- 
cgit v1.2.1