From 5762bd236c51d836d8bbfec33e1b56c2dbe632d1 Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Tue, 18 May 2021 12:08:17 +0300 Subject: [PATCH] Add EGLFS OpenWFD plugin for INTEGRITY This enables OpenWFD EGLFS integration plugin and makes EGLFS the default platform for INTEGRITY builds. Change-Id: I65332ca0ae244f40013df435828e2e359200b325 Reviewed-by: Janne Koskinen Reviewed-by: Laszlo Agocs --- src/gui/CMakeLists.txt | 2 +- src/plugins/platforms/eglfs/CMakeLists.txt | 2 ++ .../eglfs/deviceintegration/CMakeLists.txt | 2 +- .../eglfs_openwfd/CMakeLists.txt | 24 +++++++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 08cdf1b9426..c46075d3edf 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -24,7 +24,7 @@ if (QT_FEATURE_gui) elseif(QNX) set(_default_platform "qnx") elseif(INTEGRITY) - set(_default_platform "integrityfb") + set(_default_platform "eglfs") elseif(HAIKU) set(_default_platform "haiku") elseif(WASM) diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 0e0d0ed06e5..201253d6b3e 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -10,6 +10,8 @@ elseif(QT_FEATURE_eglfs_viv) set(_device_integration "eglfs_viv") elseif(QT_FEATURE_eglfs_brcm) set(_device_integration "eglfs_brcm") +elseif(QT_FEATURE_eglfs_openwfd) + set(_device_integration "eglfs_openwfd") endif() set(QT_QPA_DEFAULT_EGLFS_INTEGRATION "${_device_integration}" CACHE STRING "Default EGLFS device integration plugin") diff --git a/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt index 55c8e73398c..9e1c31527e7 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt @@ -31,7 +31,7 @@ if(QT_FEATURE_eglfs_viv_wl) add_subdirectory(eglfs_viv_wl) endif() if(QT_FEATURE_eglfs_openwfd) - # add_subdirectory(eglfs_openwfd) # special case TODO + add_subdirectory(eglfs_openwfd) endif() if(QT_FEATURE_opengl) add_subdirectory(eglfs_emu) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt new file mode 100644 index 00000000000..1a5f079a195 --- /dev/null +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from openwfd.pro. + +##################################################################### +## QEglFSOpenWFDIntegrationPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(QEglFSOpenWFDIntegrationPlugin + OUTPUT_NAME qeglfs-openwfd-integration + TYPE egldeviceintegrations + SOURCES + qeglfsopenwfdintegration.cpp qeglfsopenwfdintegration.h + qeglfsopenwfdmain.cpp + INCLUDE_DIRECTORIES + ../../api + PUBLIC_LIBRARIES + Qt::Core + Qt::CorePrivate + Qt::EglFSDeviceIntegrationPrivate + Qt::Gui + Qt::GuiPrivate +) + +#### Keys ignored in scope 1:.:.:openwfd.pro:: +# OTHER_FILES = "$$PWD/eglfs_openwfd.json"