diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-03-04 15:44:20 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-10 08:23:47 +0000 |
| commit | 5e487d398d83a5e3681537148405758362b7e94b (patch) | |
| tree | 7efad6225a2d0c9ab7656a2840e9e9c73dc38a32 | |
| parent | c2b8b9e4508c5867f2201e5311b9ee7073d2e77f (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]
Task-number: QTBUG-101382
Change-Id: I515708a8869498eb91df4fcba85a7b751d13a25c
Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
(cherry picked from commit fc1487878be07a2ead29def1bb35631119eeaa0e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
3 files changed, 1 insertions, 15 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 6b3bb92225..f59f0ab264 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 |