diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-04-26 03:31:04 -0700 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-04-27 13:19:32 +0000 |
| commit | 9a640e7bc67b0a1ff5c61c63703b669e6f24521e (patch) | |
| tree | 659bf57d2a030d4450ba3cf47110704e20199cf2 /src/plugins/platforms/eglfs | |
| parent | bf21f71b43b3f45d527af81b90bfb3919b2d38f0 (diff) | |
eglfs_kms_egldevice: Fix type mess in nativeDisplay() virtual
EGLNativeDisplayType is void* on NVIDIA systems but the backend may get compiled
on others where it is something else. The function definition does not match
the proto on these so it is time to correct this.
Change-Id: I569d9f8f3fcba7b2a4672d83606dfdc7bb18a1f0
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/plugins/platforms/eglfs')
| -rw-r--r-- | src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp index 0a66a897a1..cca413ff2d 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp @@ -77,9 +77,9 @@ void QEglFSKmsEglDevice::close() setFd(-1); } -EGLNativeDisplayType QEglFSKmsEglDevice::nativeDisplay() const +void *QEglFSKmsEglDevice::nativeDisplay() const { - return reinterpret_cast<EGLNativeDisplayType>(m_devInt->eglDevice()); + return m_devInt->eglDevice(); } QPlatformScreen *QEglFSKmsEglDevice::createScreen(const QKmsOutput &output) |