1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the EDID parser into QtGui

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2020-06-30 08:01:23 +02:00
parent b92a41ea21
commit acbe4190e9
23 changed files with 21 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/.prev_CMakeLists.txt
View File

@ -195,6 +195,8 @@ qt_add_module(Gui
util/qabstractlayoutstyleinfo.cpp util/qabstractlayoutstyleinfo_p.h util/qabstractlayoutstyleinfo.cpp util/qabstractlayoutstyleinfo_p.h
util/qastchandler.cpp util/qastchandler_p.h util/qastchandler.cpp util/qastchandler_p.h
util/qdesktopservices.cpp util/qdesktopservices.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/qgridlayoutengine.cpp util/qgridlayoutengine_p.h
util/qhexstring_p.h util/qhexstring_p.h
util/qktxhandler.cpp util/qktxhandler_p.h util/qktxhandler.cpp util/qktxhandler_p.h

2
src/gui/CMakeLists.txt
View File

@ -245,6 +245,8 @@ qt_add_module(Gui
util/qabstractlayoutstyleinfo.cpp util/qabstractlayoutstyleinfo_p.h util/qabstractlayoutstyleinfo.cpp util/qabstractlayoutstyleinfo_p.h
util/qastchandler.cpp util/qastchandler_p.h util/qastchandler.cpp util/qastchandler_p.h
util/qdesktopservices.cpp util/qdesktopservices.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/qgridlayoutengine.cpp util/qgridlayoutengine_p.h
util/qhexstring_p.h util/qhexstring_p.h
util/qktxhandler.cpp util/qktxhandler_p.h util/qktxhandler.cpp util/qktxhandler_p.h

2
src/platformsupport/edid/qedidparser.cpp → src/gui/util/qedidparser.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> ** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
** Contact: https://www.qt.io/licensing/ ** 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$ ** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage ** Commercial License Usage

8
src/platformsupport/edid/qedidparser_p.h → src/gui/util/qedidparser_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> ** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
** Contact: https://www.qt.io/licensing/ ** 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$ ** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage ** Commercial License Usage
@ -54,9 +54,13 @@
// We mean it. // We mean it.
// //
#include <QtGui/qtguiglobal.h>
#include <QtCore/qstring.h>
#include <QtCore/qmap.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QEdidParser class Q_GUI_EXPORT QEdidParser
{ {
public: public:
QEdidParser(); QEdidParser();

2
src/platformsupport/edid/qedidvendortable_p.h → src/gui/util/qedidvendortable_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> ** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
** Contact: https://www.qt.io/licensing/ ** 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$ ** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage ** Commercial License Usage

3
src/gui/util/util.pri
View File

@ -2,6 +2,8 @@
HEADERS += \ HEADERS += \
util/qdesktopservices.h \ util/qdesktopservices.h \
util/qedidparser_p.h \
util/qedidvendortable_p.h \
util/qhexstring_p.h \ util/qhexstring_p.h \
util/qvalidator.h \ util/qvalidator.h \
util/qgridlayoutengine_p.h \ util/qgridlayoutengine_p.h \
@ -23,6 +25,7 @@ HEADERS += \
SOURCES += \ SOURCES += \
util/qdesktopservices.cpp \ util/qdesktopservices.cpp \
util/qedidparser.cpp \
util/qvalidator.cpp \ util/qvalidator.cpp \
util/qgridlayoutengine.cpp \ util/qgridlayoutengine.cpp \
util/qabstractlayoutstyleinfo.cpp \ util/qabstractlayoutstyleinfo.cpp \

1
src/platformsupport/.prev_CMakeLists.txt
View File

@ -1,6 +1,5 @@
# Generated from platformsupport.pro. # Generated from platformsupport.pro.
add_subdirectory(edid)
add_subdirectory(devicediscovery) add_subdirectory(devicediscovery)
add_subdirectory(fbconvenience) add_subdirectory(fbconvenience)
add_subdirectory(linuxofono) add_subdirectory(linuxofono)

1
src/platformsupport/CMakeLists.txt
View File

@ -1,6 +1,5 @@
# Generated from platformsupport.pro. # Generated from platformsupport.pro.
add_subdirectory(edid)
add_subdirectory(devicediscovery) add_subdirectory(devicediscovery)
add_subdirectory(fbconvenience) add_subdirectory(fbconvenience)
# special case begin # special case begin

21
src/platformsupport/edid/CMakeLists.txt
View File

@ -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"

13
src/platformsupport/edid/edid.pro
View File

@ -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)

1
src/platformsupport/platformsupport.pro
View File

@ -2,7 +2,6 @@ TEMPLATE = subdirs
QT_FOR_CONFIG += gui-private QT_FOR_CONFIG += gui-private
SUBDIRS = \ SUBDIRS = \
edid \
devicediscovery \ devicediscovery \
fbconvenience fbconvenience

1
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
View File

@ -23,7 +23,6 @@ qt_internal_add_plugin(QEglFSKmsGbmIntegrationPlugin
Libdrm::Libdrm Libdrm::Libdrm
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::EdidSupportPrivate
Qt::EglFSDeviceIntegrationPrivate Qt::EglFSDeviceIntegrationPrivate
Qt::EglFsKmsSupportPrivate Qt::EglFsKmsSupportPrivate
Qt::Gui Qt::Gui

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
View File

@ -4,7 +4,7 @@ PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSKmsGbmIntegrationPlugin PLUGIN_CLASS_NAME = QEglFSKmsGbmIntegrationPlugin
load(qt_plugin) 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 INCLUDEPATH += $$PWD/../../api $$PWD/../eglfs_kms_support

1
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
View File

@ -21,7 +21,6 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
Libdrm::Libdrm Libdrm::Libdrm
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::EdidSupportPrivate
Qt::EglFSDeviceIntegrationPrivate Qt::EglFSDeviceIntegrationPrivate
Qt::EglFsKmsSupportPrivate Qt::EglFsKmsSupportPrivate
Qt::Gui Qt::Gui

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro
View File

@ -1,6 +1,6 @@
TARGET = qeglfs-kms-egldevice-integration 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 INCLUDEPATH += $$PWD/../../api $$PWD/../eglfs_kms_support

1
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
View File

@ -21,7 +21,6 @@ qt_add_module(EglFsKmsSupport
Libdrm::Libdrm Libdrm::Libdrm
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::EdidSupportPrivate
Qt::EglFSDeviceIntegrationPrivate Qt::EglFSDeviceIntegrationPrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/eglfs_kms_support.pro
View File

@ -2,7 +2,7 @@ TARGET = QtEglFsKmsSupport
CONFIG += no_module_headers internal_module CONFIG += no_module_headers internal_module
load(qt_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 INCLUDEPATH += $$PWD/../../api

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
View File

@ -47,7 +47,7 @@
#include <QtCore/QMutex> #include <QtCore/QMutex>
#include <QtKmsSupport/private/qkmsdevice_p.h> #include <QtKmsSupport/private/qkmsdevice_p.h>
#include <QtEdidSupport/private/qedidparser_p.h> #include <QtGui/private/qedidparser_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/eglfs_kms_vsp2.pro
View File

@ -4,7 +4,7 @@ PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSKmsVsp2IntegrationPlugin PLUGIN_CLASS_NAME = QEglFSKmsVsp2IntegrationPlugin
load(qt_plugin) 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 INCLUDEPATH += $$PWD/../../api $$PWD/../eglfs_kms_support

1
src/plugins/platforms/xcb/.prev_CMakeLists.txt
View File

@ -41,7 +41,6 @@ qt_add_module(XcbQpa
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
PkgConfig::XKB_COMMON_X11 PkgConfig::XKB_COMMON_X11
Qt::CorePrivate Qt::CorePrivate
Qt::EdidSupportPrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::XkbCommonSupportPrivate Qt::XkbCommonSupportPrivate
XCB::ICCCM XCB::ICCCM

1
src/plugins/platforms/xcb/CMakeLists.txt
View File

@ -41,7 +41,6 @@ qt_add_module(XcbQpa
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
PkgConfig::XKB_COMMON_X11 PkgConfig::XKB_COMMON_X11
Qt::CorePrivate Qt::CorePrivate
Qt::EdidSupportPrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::XkbCommonSupportPrivate Qt::XkbCommonSupportPrivate
XCB::ICCCM XCB::ICCCM

3
src/plugins/platforms/xcb/qxcbscreen.h
View File

@ -49,11 +49,10 @@
#include <xcb/xinerama.h> #include <xcb/xinerama.h>
#include "qxcbobject.h" #include "qxcbobject.h"
#include "qxcbscreen.h"
#include <private/qfontengine_p.h> #include <private/qfontengine_p.h>
#include <QtEdidSupport/private/qedidparser_p.h> #include <QtGui/private/qedidparser_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

1
src/plugins/platforms/xcb/xcb_qpa_lib.pro
View File

@ -4,7 +4,6 @@ DEFINES += QT_NO_FOREACH
QT += \ QT += \
core-private gui-private \ core-private gui-private \
edid_support-private \
xkbcommon_support-private xkbcommon_support-private
qtConfig(opengl): QT += opengl-private qtConfig(opengl): QT += opengl-private