summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-04-16 15:28:59 -0700
committerThiago Macieira <thiago.macieira@intel.com>2017-04-18 17:03:50 +0000
commit67f1a189684f09828a27773dc11d948b39f22fa4 (patch)
tree1da9fe44f25c846fa2e34b83a4cfdb238911bad3
parent564cb03ffbd9ebab1aff78a9848920bf9856be78 (diff)
Fix build with libdrm >= 2.4.78
drmEventContext has grown by one pointer, so the build fails with an error about a member without initialization. qeglfskmsgbmdevice.cpp:147:5: error: missing initializer for member ‘_drmEventContext::page_flip_handler2’ [-Werror=missing-field-initializers] Change-Id: I0e1a09998253489388abfffd14b6014b1ddc90e1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 34d2fd14979198dc0fcc07f73581ece9540c4b72)
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsdevice.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsdevice.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsdevice.cpp
index 8ba0a5cdd0..664b1d5cb5 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsdevice.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsdevice.cpp
@@ -439,11 +439,11 @@ QPlatformCursor *QEglFSKmsDevice::globalCursor() const
void QEglFSKmsDevice::handleDrmEvent()
{
- drmEventContext drmEvent = {
- DRM_EVENT_CONTEXT_VERSION,
- Q_NULLPTR, // vblank handler
- pageFlipHandler // page flip handler
- };
+ drmEventContext drmEvent;
+ memset(&drmEvent, 0, sizeof(drmEvent));
+ drmEvent.version = DRM_EVENT_CONTEXT_VERSION;
+ drmEvent.vblank_handler = nullptr;
+ drmEvent.page_flip_handler = pageFlipHandler;
drmHandleEvent(m_dri_fd, &drmEvent);
}