diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-03-04 15:44:20 +0200 |
|---|---|---|
| committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-03-07 21:58:06 +0200 |
| commit | fc1487878be07a2ead29def1bb35631119eeaa0e (patch) | |
| tree | 2547908c4323ffb037922321cad11ca6cda58fc6 /src | |
| parent | 53890b5d3cd771d66d6b73940eb38e3c3fc6d60f (diff) | |
eglfs: QNX uses own QPA plugin and not eglfs
Remove compilation workarounds to get rid of warnings as those QPA
plugins are not supported by QNX.
warning: cast from 'void*' to 'EGLNativeDisplayType' {aka 'int'}
loses precision [-fpermissive]
warning: invalid conversion from 'EGLNativeDisplayType' {aka 'int'}
to 'void*' [-fpermissive]
Pick-to: 6.2 6.3
Task-number: QTBUG-101382
Change-Id: I515708a8869498eb91df4fcba85a7b751d13a25c
Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
Diffstat (limited to 'src')
3 files changed, 1 insertions, 15 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index a782bedb66..b2c9bf7797 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -796,7 +796,7 @@ qt_feature("egl_x11" PRIVATE qt_feature("eglfs" PRIVATE SECTION "Platform plugins" LABEL "EGLFS" - CONDITION NOT ANDROID AND NOT APPLE AND NOT WIN32 AND NOT WASM AND QT_FEATURE_egl + CONDITION NOT ANDROID AND NOT APPLE AND NOT WIN32 AND NOT WASM AND NOT QNX AND QT_FEATURE_egl ) qt_feature("eglfs_brcm" PRIVATE LABEL "EGLFS Raspberry Pi" 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 7cac8ea5dc..a9be917555 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -27,10 +27,3 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin #### Keys ignored in scope 1:.:.:eglfs_kms_egldevice.pro:<TRUE>: # OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json" - -# begin special case -qt_internal_extend_target(QEglFSKmsEglDeviceIntegrationPlugin - CONDITION QNX - COMPILE_OPTIONS -fpermissive -) -# end special case 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 a20aa173db..f9458ae5c6 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt @@ -24,10 +24,3 @@ qt_internal_add_module(EglFsKmsSupportPrivate Qt::GuiPrivate Qt::KmsSupportPrivate ) - -# begin special case -qt_internal_extend_target(EglFsKmsSupportPrivate - CONDITION QNX - COMPILE_OPTIONS -fpermissive -) -# end special case |