diff options
| author | Elvis Lee <kwangwoong.lee@lge.com> | 2020-11-05 18:22:02 +0900 |
|---|---|---|
| committer | Elvis Lee <kwangwoong.lee@lge.com> | 2020-11-17 22:11:08 +0900 |
| commit | 0decd926adf239ed48ccf984140b15fb304805a3 (patch) | |
| tree | 4198f97c1c12825a008f05ba1c7234355084cf27 /src/plugins/platforms/eglfs/deviceintegration/eglfs_kms | |
| parent | 2e3b8b36f7aa43991b44bc6b048c713b0a013a57 (diff) | |
Correct headers to build with eglfs modules
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>
Diffstat (limited to 'src/plugins/platforms/eglfs/deviceintegration/eglfs_kms')
6 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt index 44ddebbf9b..19169981d1 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt @@ -15,9 +15,6 @@ qt_internal_add_module(EglFsKmsGbmSupport qeglfskmsgbmwindow.cpp qeglfskmsgbmwindow_p.h DEFINES QT_EGL_NO_X11 - INCLUDE_DIRECTORIES - ../../api - ../eglfs_kms_support PUBLIC_LIBRARIES Libdrm::Libdrm Qt::CorePrivate diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms_gbm_support.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms_gbm_support.pro index 7fde6f81d7..8c05f16008 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms_gbm_support.pro +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms_gbm_support.pro @@ -4,8 +4,6 @@ load(qt_module) 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 DEFINES += QT_EGL_NO_X11 diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp index c561b2072e..b5b7811b79 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp @@ -42,7 +42,7 @@ #include "qeglfskmsgbmdevice_p.h" #include "qeglfskmsgbmscreen_p.h" -#include "qeglfsintegration_p.h" +#include <private/qeglfsintegration_p.h> #include <QtCore/QLoggingCategory> #include <QtCore/private/qcore_unix_p.h> diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice_p.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice_p.h index 5a9cdb1565..bb67d800ee 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice_p.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice_p.h @@ -54,7 +54,7 @@ // #include "qeglfskmsgbmcursor_p.h" -#include <qeglfskmsdevice_p.h> +#include <private/qeglfskmsdevice_p.h> #include <gbm.h> diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp index 69a8aede56..c67dacfbc7 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp @@ -42,7 +42,7 @@ #include "qeglfskmsgbmscreen_p.h" #include "qeglfskmsgbmdevice_p.h" #include "qeglfskmsgbmcursor_p.h" -#include "qeglfsintegration_p.h" +#include <private/qeglfsintegration_p.h> #include <QtCore/QLoggingCategory> diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen_p.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen_p.h index 72986b45c8..5be28fa971 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen_p.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qeglfskmsscreen_p.h" +#include <private/qeglfskmsscreen_p.h> #include <QMutex> #include <QWaitCondition> |