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

Correct headers to build with eglfs modules

Browse Source 
To build with eglfs module and gbm device integration module,
some headers should consider global path, not local.

This covers eglfs_kms and eglfs_kms_egldeivce device integration.
Other device integrations might be future work if needed.

Task-number: QTBUG-85268
Change-Id: I1bad5fbac99aa79d146e90f88b53519b09254e13
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Elvis Lee <kwangwoong.lee@lge.com>
This commit is contained in:
Elvis Lee 2020-11-05 18:22:02 +09:00
parent 2e3b8b36f7
commit 0decd926ad
17 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/eglfs/CMakeLists.txt
View File

@ -107,8 +107,6 @@ qt_internal_add_plugin(QEglFSIntegrationPlugin
qeglfsmain.cpp qeglfsmain.cpp
DEFINES DEFINES
QT_EGL_NO_X11 QT_EGL_NO_X11
INCLUDE_DIRECTORIES
api
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate # special case Qt::CorePrivate # special case
Qt::EglFSDeviceIntegrationPrivate Qt::EglFSDeviceIntegrationPrivate

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

@ -15,9 +15,6 @@ qt_internal_add_module(EglFsKmsGbmSupport
qeglfskmsgbmwindow.cpp qeglfskmsgbmwindow_p.h qeglfskmsgbmwindow.cpp qeglfskmsgbmwindow_p.h
DEFINES DEFINES
QT_EGL_NO_X11 QT_EGL_NO_X11
INCLUDE_DIRECTORIES
../../api
../eglfs_kms_support
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Libdrm::Libdrm Libdrm::Libdrm
Qt::CorePrivate Qt::CorePrivate

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

@ -4,8 +4,6 @@ load(qt_module)
QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private
INCLUDEPATH += $$PWD/../../api $$PWD/../eglfs_kms_support
# Avoid X11 header collision, use generic EGL native types # Avoid X11 header collision, use generic EGL native types
DEFINES += QT_EGL_NO_X11 DEFINES += QT_EGL_NO_X11

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp
View File

@ -42,7 +42,7 @@
#include "qeglfskmsgbmdevice_p.h" #include "qeglfskmsgbmdevice_p.h"
#include "qeglfskmsgbmscreen_p.h" #include "qeglfskmsgbmscreen_p.h"
#include "qeglfsintegration_p.h" #include <private/qeglfsintegration_p.h>
#include <QtCore/QLoggingCategory> #include <QtCore/QLoggingCategory>
#include <QtCore/private/qcore_unix_p.h> #include <QtCore/private/qcore_unix_p.h>

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice_p.h
View File

@ -54,7 +54,7 @@
// //
#include "qeglfskmsgbmcursor_p.h" #include "qeglfskmsgbmcursor_p.h"
#include <qeglfskmsdevice_p.h> #include <private/qeglfskmsdevice_p.h>
#include <gbm.h> #include <gbm.h>

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
View File

@ -42,7 +42,7 @@
#include "qeglfskmsgbmscreen_p.h" #include "qeglfskmsgbmscreen_p.h"
#include "qeglfskmsgbmdevice_p.h" #include "qeglfskmsgbmdevice_p.h"
#include "qeglfskmsgbmcursor_p.h" #include "qeglfskmsgbmcursor_p.h"
#include "qeglfsintegration_p.h" #include <private/qeglfsintegration_p.h>
#include <QtCore/QLoggingCategory> #include <QtCore/QLoggingCategory>

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen_p.h
View File

@ -53,7 +53,7 @@
// We mean it. // We mean it.
// //
#include "qeglfskmsscreen_p.h" #include <private/qeglfskmsscreen_p.h>
#include <QMutex> #include <QMutex>
#include <QWaitCondition> #include <QWaitCondition>

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

@ -14,9 +14,6 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
qeglfskmsegldevicescreen.cpp qeglfskmsegldevicescreen.h qeglfskmsegldevicescreen.cpp qeglfskmsegldevicescreen.h
DEFINES DEFINES
QT_EGL_NO_X11 QT_EGL_NO_X11
INCLUDE_DIRECTORIES
../../api
../eglfs_kms_support
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Libdrm::Libdrm Libdrm::Libdrm
Qt::Core Qt::Core

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

@ -2,8 +2,6 @@ TARGET = qeglfs-kms-egldevice-integration
QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private
INCLUDEPATH += $$PWD/../../api $$PWD/../eglfs_kms_support
# Avoid X11 header collision, use generic EGL native types # Avoid X11 header collision, use generic EGL native types
DEFINES += QT_EGL_NO_X11 DEFINES += QT_EGL_NO_X11

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.h
View File

@ -40,7 +40,7 @@
#ifndef QEGLFSKMSEGLDEVICE_H #ifndef QEGLFSKMSEGLDEVICE_H
#define QEGLFSKMSEGLDEVICE_H #define QEGLFSKMSEGLDEVICE_H
#include <qeglfskmsdevice_p.h> #include <private/qeglfskmsdevice_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h
View File

@ -41,7 +41,7 @@
#ifndef QEGLFSKMSEGLDEVICEINTEGRATION_H #ifndef QEGLFSKMSEGLDEVICEINTEGRATION_H
#define QEGLFSKMSEGLDEVICEINTEGRATION_H #define QEGLFSKMSEGLDEVICEINTEGRATION_H
#include <qeglfskmsintegration_p.h> #include <private/qeglfskmsintegration_p.h>
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.h
View File

@ -40,7 +40,7 @@
#ifndef QEGLFSKMSEGLDEVICESCREEN_H #ifndef QEGLFSKMSEGLDEVICESCREEN_H
#define QEGLFSKMSEGLDEVICESCREEN_H #define QEGLFSKMSEGLDEVICESCREEN_H
#include <qeglfskmsscreen_p.h> #include <private/qeglfskmsscreen_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -15,8 +15,6 @@ qt_internal_add_module(EglFsKmsSupport
qeglfskmsscreen.cpp qeglfskmsscreen_p.h qeglfskmsscreen.cpp qeglfskmsscreen_p.h
DEFINES DEFINES
QT_EGL_NO_X11 QT_EGL_NO_X11
INCLUDE_DIRECTORIES
../../api
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Libdrm::Libdrm Libdrm::Libdrm
Qt::Core Qt::Core

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

@ -4,8 +4,6 @@ load(qt_module)
QT += core-private gui-private eglfsdeviceintegration-private kms_support-private QT += core-private gui-private eglfsdeviceintegration-private kms_support-private
INCLUDEPATH += $$PWD/../../api
# Avoid X11 header collision, use generic EGL native types # Avoid X11 header collision, use generic EGL native types
DEFINES += QT_EGL_NO_X11 DEFINES += QT_EGL_NO_X11

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

@ -41,7 +41,7 @@
#include "qeglfskmsscreen_p.h" #include "qeglfskmsscreen_p.h"
#include "qeglfskmsdevice_p.h" #include "qeglfskmsdevice_p.h"
#include "qeglfsintegration_p.h" #include <private/qeglfsintegration_p.h>
#include <QtCore/QLoggingCategory> #include <QtCore/QLoggingCategory>

2
src/plugins/platforms/eglfs/eglfs-plugin.pro
View File

@ -11,8 +11,6 @@ SOURCES += $$PWD/qeglfsmain.cpp
OTHER_FILES += $$PWD/eglfs.json OTHER_FILES += $$PWD/eglfs.json
INCLUDEPATH += $$PWD/api
PLUGIN_TYPE = platforms PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = - !equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -

2
src/plugins/platforms/eglfs/qeglfsmain.cpp
View File

@ -38,7 +38,7 @@
****************************************************************************/ ****************************************************************************/
#include <qpa/qplatformintegrationplugin.h> #include <qpa/qplatformintegrationplugin.h>
#include "qeglfsintegration_p.h" #include <private/qeglfsintegration_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE