diff options
Diffstat (limited to 'src/plugins')
9 files changed, 59 insertions, 51 deletions
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index 0f7c305a40..79496058e3 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -42,7 +42,6 @@ add_qt_module(EglFSDeviceIntegration ) #### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>: -# CONFIG = "internal_module" "egl" # MODULE = "eglfsdeviceintegration" # _LOADED = "qt_module" @@ -73,16 +72,17 @@ extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEM EGLFS_PREFERRED_PLUGIN= ) -#### Keys ignored in scope 7:.:.:eglfsdeviceintegration.pro:use_gold_linker: -# CONFIG = "no_linker_version_script" - # Resources: +set(cursor_resource_files + "cursor-atlas.png" + "cursor.json" +) + add_qt_resource(EglFSDeviceIntegration "cursor" PREFIX "/" FILES - cursor-atlas.png - cursor.json + ${cursor_resource_files} ) @@ -111,10 +111,7 @@ add_qt_plugin(qeglfs ) #### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>: -# CONFIG = "egl" # OTHER_FILES = "$$PWD/eglfs.json" -# PLUGIN_CLASS_NAME = "QEglFSIntegrationPlugin" -# PLUGIN_TYPE = "platforms" # _LOADED = "qt_plugin" ## Scopes: diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 510a606152..26784ca291 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -34,7 +34,6 @@ add_qt_module(EglFSDeviceIntegration ) #### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>: -# CONFIG = "internal_module" "egl" # MODULE = "eglfsdeviceintegration" # _LOADED = "qt_module" @@ -59,16 +58,17 @@ extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupp # extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY ... # extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY ... -#### Keys ignored in scope 7:.:.:eglfsdeviceintegration.pro:use_gold_linker: -# CONFIG = "no_linker_version_script" - # Resources: +set(cursor_resource_files + "cursor-atlas.png" + "cursor.json" +) + add_qt_resource(EglFSDeviceIntegration "cursor" PREFIX "/" FILES - cursor-atlas.png - cursor.json + ${cursor_resource_files} ) @@ -98,10 +98,7 @@ add_qt_plugin(qeglfs ) #### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>: -# CONFIG = "egl" # OTHER_FILES = "$$PWD/eglfs.json" -# PLUGIN_CLASS_NAME = "QEglFSIntegrationPlugin" -# PLUGIN_TYPE = "platforms" # _LOADED = "qt_plugin" ## Scopes: diff --git a/src/plugins/platforms/eglfs/deviceintegration/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/.prev_CMakeLists.txt new file mode 100644 index 0000000000..d08bf6bc20 --- /dev/null +++ b/src/plugins/platforms/eglfs/deviceintegration/.prev_CMakeLists.txt @@ -0,0 +1,38 @@ +# Generated from deviceintegration.pro. + +if(QT_FEATURE_eglfs_x11) + add_subdirectory(eglfs_x11) +endif() +if(QT_FEATURE_eglfs_egldevice OR QT_FEATURE_eglfs_gbm) + add_subdirectory(eglfs_kms_support) +endif() +if(QT_FEATURE_eglfs_gbm) + add_subdirectory(eglfs_kms) +endif() +if(QT_FEATURE_eglfs_egldevice) + add_subdirectory(eglfs_kms_egldevice) +endif() +if(QT_FEATURE_eglfs_vsp2) + add_subdirectory(eglfs_kms_vsp2) +endif() +if(QT_FEATURE_eglfs_brcm) + add_subdirectory(eglfs_brcm) +endif() +if(QT_FEATURE_eglfs_mali) + add_subdirectory(eglfs_mali) +endif() +if(QT_FEATURE_eglfs_viv) + add_subdirectory(eglfs_viv) +endif() +if(QT_FEATURE_eglfs_rcar) + add_subdirectory(eglfs_rcar) +endif() +if(QT_FEATURE_eglfs_viv_wl) + add_subdirectory(eglfs_viv_wl) +endif() +if(QT_FEATURE_eglfs_openwfd) + add_subdirectory(eglfs_openwfd) +endif() +if(QT_FEATURE_opengl) + add_subdirectory(eglfs_emu) +endif() diff --git a/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt index 396964a5e7..7ddcb8993f 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt @@ -1,49 +1,38 @@ # Generated from deviceintegration.pro. -if(QT_FEATURE_egl_x11) +if(QT_FEATURE_eglfs_x11) add_subdirectory(eglfs_x11) endif() - -if(QT_FEATURE_eglfs_gbm OR QT_FEATURE_eglfs_egldevice) +if(QT_FEATURE_eglfs_egldevice OR QT_FEATURE_eglfs_gbm) add_subdirectory(eglfs_kms_support) endif() - if(QT_FEATURE_eglfs_gbm) add_subdirectory(eglfs_kms) endif() - if(QT_FEATURE_eglfs_egldevice) add_subdirectory(eglfs_kms_egldevice) endif() - if(QT_FEATURE_eglfs_vsp2) -# TODO add_subdirectory(eglfs_kms_vsp2) + # add_subdirectory(eglfs_kms_vsp2) # special case TODO endif() - if(QT_FEATURE_eglfs_brcm) -# TODO add_subdirectory(eglfs_brcm) + # add_subdirectory(eglfs_brcm) # special case TODO endif() - if(QT_FEATURE_eglfs_mali) -# TODO add_subdirectory(eglfs_mali) + # add_subdirectory(eglfs_mali) # special case TODO endif() - if(QT_FEATURE_eglfs_viv) -# TODO add_subdirectory(eglfs_viv) + # add_subdirectory(eglfs_viv) # special case TODO endif() - if(QT_FEATURE_eglfs_rcar) -# TODO add_subdirectory(eglfs_rcar) + # add_subdirectory(eglfs_rcar) # special case TODO endif() - if(QT_FEATURE_eglfs_viv_wl) -# TODO add_subdirectory(eglfs_viv_wl) + # add_subdirectory(eglfs_viv_wl) # special case TODO endif() - if(QT_FEATURE_eglfs_openwfd) -# TODO add_subdirectory(eglfs_openwfd) + # add_subdirectory(eglfs_openwfd) # special case TODO endif() - if(QT_FEATURE_opengl) add_subdirectory(eglfs_emu) endif() diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt index a9ab601dad..3ebe169d33 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt @@ -26,9 +26,6 @@ add_qt_plugin(qeglfs-emu-integration ) #### Keys ignored in scope 1:.:.:eglfs_emu.pro:<TRUE>: -# CONFIG = "egl" # DISTFILES = "eglfs_emu.json" # OTHER_FILES = "$$PWD/eglfs_emu.json" -# PLUGIN_CLASS_NAME = "QEglFSEmulatorIntegrationPlugin" -# PLUGIN_TYPE = "egldeviceintegrations" # _LOADED = "qt_plugin" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt index 579220dd47..57e0f1d248 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt @@ -38,8 +38,5 @@ add_qt_plugin(qeglfs-kms-integration ) #### Keys ignored in scope 1:.:.:eglfs_kms.pro:<TRUE>: -# CONFIG = "egl" # OTHER_FILES = "$$PWD/eglfs_kms.json" -# PLUGIN_CLASS_NAME = "QEglFSKmsGbmIntegrationPlugin" -# PLUGIN_TYPE = "egldeviceintegrations" # _LOADED = "qt_plugin" 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 cdaca72ac4..07a72ce61f 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -35,8 +35,5 @@ add_qt_plugin(qeglfs-kms-egldevice-integration ) #### Keys ignored in scope 1:.:.:eglfs_kms_egldevice.pro:<TRUE>: -# CONFIG = "egl" # OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json" -# PLUGIN_CLASS_NAME = "QEglFSKmsEglDeviceIntegrationPlugin" -# PLUGIN_TYPE = "egldeviceintegrations" # _LOADED = "qt_plugin" 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 be26d40f4d..0c51781475 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt @@ -32,5 +32,4 @@ add_qt_module(EglFsKmsSupport ) #### Keys ignored in scope 1:.:.:eglfs_kms_support.pro:<TRUE>: -# CONFIG = "no_module_headers" "internal_module" "egl" # _LOADED = "qt_module" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt index 14a7d59227..816fe3fc13 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt @@ -27,8 +27,5 @@ add_qt_plugin(qeglfs-x11-integration ) #### Keys ignored in scope 1:.:.:eglfs_x11.pro:<TRUE>: -# CONFIG = "egl" # OTHER_FILES = "$$PWD/eglfs_x11.json" -# PLUGIN_CLASS_NAME = "QEglFSX11IntegrationPlugin" -# PLUGIN_TYPE = "egldeviceintegrations" # _LOADED = "qt_plugin" |