Move the EDID parser into QtGui

As a drive by, fix recursive inclusion in qxcbscreen.h.

Task-number: QTBUG-83255
Change-Id: Ia008921b559ef450c07aa17ca554c6b35e0a88bd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

23 files changed, 21 insertions, 54 deletions

diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 56061ed7d2..2d76e02567 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -195,6 +195,8 @@ qt_add_module(Gui
         util/qabstractlayoutstyleinfo.cpp util/qabstractlayoutstyleinfo_p.h
         util/qastchandler.cpp util/qastchandler_p.h
         util/qdesktopservices.cpp util/qdesktopservices.h
+        util/qedidparser.cpp util/qedidparser_p.h
+        util/qedidvendortable_p.h
         util/qgridlayoutengine.cpp util/qgridlayoutengine_p.h
         util/qhexstring_p.h
         util/qktxhandler.cpp util/qktxhandler_p.h
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index cfcd759f1e..99fe0a9b05 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -245,6 +245,8 @@ qt_add_module(Gui
         util/qabstractlayoutstyleinfo.cpp util/qabstractlayoutstyleinfo_p.h
         util/qastchandler.cpp util/qastchandler_p.h
         util/qdesktopservices.cpp util/qdesktopservices.h
+        util/qedidparser.cpp util/qedidparser_p.h
+        util/qedidvendortable_p.h
         util/qgridlayoutengine.cpp util/qgridlayoutengine_p.h
         util/qhexstring_p.h
         util/qktxhandler.cpp util/qktxhandler_p.h
diff --git a/src/platformsupport/edid/qedidparser.cpp b/src/gui/util/qedidparser.cpp
index 6bf1f1db96..7ca514e7c6 100644
--- a/src/platformsupport/edid/qedidparser.cpp
+++ b/src/gui/util/qedidparser.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/platformsupport/edid/qedidparser_p.h b/src/gui/util/qedidparser_p.h
index c436155258..363ab251af 100644
--- a/src/platformsupport/edid/qedidparser_p.h
+++ b/src/gui/util/qedidparser_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -54,9 +54,13 @@
 // We mean it.
 //
 
+#include <QtGui/qtguiglobal.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qmap.h>
+
 QT_BEGIN_NAMESPACE
 
-class QEdidParser
+class Q_GUI_EXPORT QEdidParser
 {
 public:
     QEdidParser();
diff --git a/src/platformsupport/edid/qedidvendortable_p.h b/src/gui/util/qedidvendortable_p.h
index 5768dbe992..d5b86833f4 100644
--- a/src/platformsupport/edid/qedidvendortable_p.h
+++ b/src/gui/util/qedidvendortable_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri
index a799c3e591..31a243c23f 100644
--- a/src/gui/util/util.pri
+++ b/src/gui/util/util.pri
@@ -2,6 +2,8 @@
 
 HEADERS += \
         util/qdesktopservices.h \
+        util/qedidparser_p.h \
+        util/qedidvendortable_p.h \
         util/qhexstring_p.h \
         util/qvalidator.h \
         util/qgridlayoutengine_p.h \
@@ -23,6 +25,7 @@ HEADERS += \
 
 SOURCES += \
         util/qdesktopservices.cpp \
+        util/qedidparser.cpp \
         util/qvalidator.cpp \
         util/qgridlayoutengine.cpp \
         util/qabstractlayoutstyleinfo.cpp \
diff --git a/src/platformsupport/.prev_CMakeLists.txt b/src/platformsupport/.prev_CMakeLists.txt
index 4b2fce1c6c..c43707948b 100644
--- a/src/platformsupport/.prev_CMakeLists.txt
+++ b/src/platformsupport/.prev_CMakeLists.txt
@@ -1,6 +1,5 @@
 # Generated from platformsupport.pro.
 
-add_subdirectory(edid)
 add_subdirectory(devicediscovery)
 add_subdirectory(fbconvenience)
 add_subdirectory(linuxofono)
diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index a2f8447c97..fd308c99fd 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -1,6 +1,5 @@
 # Generated from platformsupport.pro.
 
-add_subdirectory(edid)
 add_subdirectory(devicediscovery)
 add_subdirectory(fbconvenience)
 # special case begin
diff --git a/src/platformsupport/edid/CMakeLists.txt b/src/platformsupport/edid/CMakeLists.txt
deleted file mode 100644
index aaea30448e..0000000000
--- a/src/platformsupport/edid/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated from edid.pro.
-
-#####################################################################
-## EdidSupport Module:
-#####################################################################
-
-qt_add_module(EdidSupport
-    STATIC
-    INTERNAL_MODULE
-    SOURCES
-        qedidparser.cpp qedidparser_p.h
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-    PRECOMPILED_HEADER
-        "../../corelib/global/qt_pch.h"
-)
-
-#### Keys ignored in scope 1:.:.:edid.pro:<TRUE>:
-# MODULE = "edid_support"
diff --git a/src/platformsupport/edid/edid.pro b/src/platformsupport/edid/edid.pro
deleted file mode 100644
index 842a91170e..0000000000
--- a/src/platformsupport/edid/edid.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TARGET = QtEdidSupport
-MODULE = edid_support
-
-QT = core-private
-CONFIG += static internal_module
-
-DEFINES += QT_NO_CAST_FROM_ASCII
-PRECOMPILED_HEADER = ../../corelib/global/qt_pch.h
-
-HEADERS += qedidparser_p.h
-SOURCES += qedidparser.cpp
-
-load(qt_module)
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index 64ce2e4b16..76ed9da61a 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -2,7 +2,6 @@ TEMPLATE = subdirs
 QT_FOR_CONFIG += gui-private
 
 SUBDIRS = \
-    edid \
     devicediscovery \
     fbconvenience
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
index 7e9304f62f..3f27a9c397 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@@ -23,7 +23,6 @@ qt_internal_add_plugin(QEglFSKmsGbmIntegrationPlugin
         Libdrm::Libdrm
         Qt::Core
         Qt::CorePrivate
-        Qt::EdidSupportPrivate
         Qt::EglFSDeviceIntegrationPrivate
         Qt::EglFsKmsSupportPrivate
         Qt::Gui
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
index f5c2c0ed89..caf723155a 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
@@ -4,7 +4,7 @@ PLUGIN_TYPE = egldeviceintegrations
 PLUGIN_CLASS_NAME = QEglFSKmsGbmIntegrationPlugin
 load(qt_plugin)
 
-QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private edid_support-private
+QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private
 
 INCLUDEPATH += $$PWD/../../api $$PWD/../eglfs_kms_support
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
index b3e3018366..6f1d5f6751 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
@@ -21,7 +21,6 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
         Libdrm::Libdrm
         Qt::Core
         Qt::CorePrivate
-        Qt::EdidSupportPrivate
         Qt::EglFSDeviceIntegrationPrivate
         Qt::EglFsKmsSupportPrivate
         Qt::Gui
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro
index a6145c07e6..65e3e7be3b 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro
@@ -1,6 +1,6 @@
 TARGET = qeglfs-kms-egldevice-integration
 
-QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private edid_support-private
+QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private
 
 INCLUDEPATH += $$PWD/../../api $$PWD/../eglfs_kms_support
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
index abaad3930d..ec11b355af 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
@@ -21,7 +21,6 @@ qt_add_module(EglFsKmsSupport
         Libdrm::Libdrm
         Qt::Core
         Qt::CorePrivate
-        Qt::EdidSupportPrivate
         Qt::EglFSDeviceIntegrationPrivate
         Qt::Gui
         Qt::GuiPrivate
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/eglfs_kms_support.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/eglfs_kms_support.pro
index e51903ed96..42807b8862 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/eglfs_kms_support.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/eglfs_kms_support.pro
@@ -2,7 +2,7 @@ TARGET = QtEglFsKmsSupport
 CONFIG += no_module_headers internal_module
 load(qt_module)
 
-QT += core-private gui-private eglfsdeviceintegration-private kms_support-private edid_support-private
+QT += core-private gui-private eglfsdeviceintegration-private kms_support-private
 
 INCLUDEPATH += $$PWD/../../api
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
index a5c8f5b4e8..0f0b10a980 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
@@ -47,7 +47,7 @@
 #include <QtCore/QMutex>
 
 #include <QtKmsSupport/private/qkmsdevice_p.h>
-#include <QtEdidSupport/private/qedidparser_p.h>
+#include <QtGui/private/qedidparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/eglfs_kms_vsp2.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/eglfs_kms_vsp2.pro
index f63b768a38..a1a1c55383 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/eglfs_kms_vsp2.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/eglfs_kms_vsp2.pro
@@ -4,7 +4,7 @@ PLUGIN_TYPE = egldeviceintegrations
 PLUGIN_CLASS_NAME = QEglFSKmsVsp2IntegrationPlugin
 load(qt_plugin)
 
-QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private edid_support-private
+QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private
 
 INCLUDEPATH += $$PWD/../../api $$PWD/../eglfs_kms_support
 
diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
index 350e97dd1f..db0d1adb16 100644
--- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
@@ -41,7 +41,6 @@ qt_add_module(XcbQpa
     PUBLIC_LIBRARIES
         PkgConfig::XKB_COMMON_X11
         Qt::CorePrivate
-        Qt::EdidSupportPrivate
         Qt::GuiPrivate
         Qt::XkbCommonSupportPrivate
         XCB::ICCCM
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index 352a071df7..5193823904 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -41,7 +41,6 @@ qt_add_module(XcbQpa
     PUBLIC_LIBRARIES
         PkgConfig::XKB_COMMON_X11
         Qt::CorePrivate
-        Qt::EdidSupportPrivate
         Qt::GuiPrivate
         Qt::XkbCommonSupportPrivate
         XCB::ICCCM
diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h
index 79698b4ef3..e3c5a5e11b 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.h
+++ b/src/plugins/platforms/xcb/qxcbscreen.h
@@ -49,11 +49,10 @@
 #include <xcb/xinerama.h>
 
 #include "qxcbobject.h"
-#include "qxcbscreen.h"
 
 #include <private/qfontengine_p.h>
 
-#include <QtEdidSupport/private/qedidparser_p.h>
+#include <QtGui/private/qedidparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index 49d5cf7b63..1b42a60e0c 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -4,7 +4,6 @@ DEFINES += QT_NO_FOREACH
 
 QT += \
     core-private gui-private \
-    edid_support-private \
     xkbcommon_support-private
 
 qtConfig(opengl): QT += opengl-private