diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:14:48 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:15:09 +0200 |
commit | 16a36239ab9e9be45a940aeff94f35e29bdeb944 (patch) | |
tree | ed6c159f12fa2ff80cf39b97a65eab0546ffe639 /mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp | |
parent | e37001aad7f6e4bbad250addba033f1eaf97d566 (diff) | |
parent | 00da2e615e89c46affbc130b4df6148785724a23 (diff) |
Merge branch 'stable' into dev
Change-Id: I06694436322a7810a163b27b8a059cee2b046f06
Diffstat (limited to 'mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp')
-rw-r--r-- | mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp index add96bf14e..671f525250 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +++ b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp @@ -226,7 +226,7 @@ public: virtual void platformDestroy(); virtual EGLNativeDisplayType platformDisplay() const; virtual QSize screenSize() const; - virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format); + virtual EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format); virtual void destroyNativeWindow(EGLNativeWindowType window); virtual bool hasCapability(QPlatformIntegration::Capability cap) const; @@ -258,8 +258,9 @@ QSize QEglFSPiHooks::screenSize() const return QSize(width, height); } -EGLNativeWindowType QEglFSPiHooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format) +EGLNativeWindowType QEglFSPiHooks::createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) { + Q_UNUSED(window) return createDispmanxLayer(QPoint(0, 0), size, 1, format.hasAlpha() ? DISPMANX_FLAGS_ALPHA_FROM_SOURCE : DISPMANX_FLAGS_ALPHA_FIXED_ALL_PIXELS); } |