diff options
Diffstat (limited to 'src/plugins/platforms/eglfs')
3 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro index dcfb4cd26d..33f219db96 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro @@ -6,6 +6,9 @@ load(qt_plugin) QT += core-private gui-private platformsupport-private eglfs_device_lib-private +# Avoid X11 header collision +DEFINES += MESA_EGL_NO_X11_HEADERS + INCLUDEPATH += $$PWD/../.. CONFIG += egl QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp index 6e5421d5b9..455d78035a 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp @@ -66,7 +66,9 @@ void QEglFSMaliIntegration::platformInit() vinfo.green.offset = 8; vinfo.red.offset = 16; vinfo.transp.offset = 24; +#if 0 vinfo.yres_virtual = 2 * vinfo.yres; +#endif if (ioctl(fd, FBIOPUT_VSCREENINFO, &vinfo) == -1) qErrnoWarning(errno, "Unable to set double buffer mode!"); @@ -90,7 +92,7 @@ EGLNativeWindowType QEglFSMaliIntegration::createNativeWindow(QPlatformWindow *w void QEglFSMaliIntegration::destroyNativeWindow(EGLNativeWindowType window) { - free(window); + free((void*)window); } QT_END_NAMESPACE diff --git a/src/plugins/platforms/eglfs/qeglfsdeviceintegration.cpp b/src/plugins/platforms/eglfs/qeglfsdeviceintegration.cpp index 2a46c87862..359b90f205 100644 --- a/src/plugins/platforms/eglfs/qeglfsdeviceintegration.cpp +++ b/src/plugins/platforms/eglfs/qeglfsdeviceintegration.cpp @@ -154,6 +154,10 @@ void QEGLDeviceIntegration::platformInit() qWarning("EGLFS: Failed to open %s", fbDev.constData()); qFatal("EGLFS: Can't continue without a display"); } + +#ifdef FBIOBLANK + ioctl(framebuffer, FBIOBLANK, VESA_NO_BLANKING); +#endif } void QEGLDeviceIntegration::platformDestroy() |