whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Pasi Petäjäjärvi 2022-03-04 15:44:20 +02:00
parent 53890b5d3c
commit fc1487878b
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/configure.cmake
View File

@ -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"

7
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
View File

@ -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

7
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
View File

@ -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