From 7805d39ca3ae91a0f444966e5a501181c15e3a5f Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 18 Sep 2013 11:00:24 +0200 Subject: Fix android after Eglfs binary compatibility break Change-Id: I95d98b475188b43f1e0946c7ad6fd2388839d619 Reviewed-by: Laszlo Agocs --- src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/android') diff --git a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp index 917942128f..338966eb40 100644 --- a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp +++ b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp @@ -61,7 +61,7 @@ public: Qt::ScreenOrientation nativeOrientation() const; int screenDepth() const; QSurfaceFormat surfaceFormatFor(const QSurfaceFormat &inputFormat) const; - EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format); + EGLNativeWindowType createNativeWindow(QPlatformWindow *platformWindow, const QSize &size, const QSurfaceFormat &format); void destroyNativeWindow(EGLNativeWindowType window); bool hasCapability(QPlatformIntegration::Capability cap) const; QEglFSCursor *createCursor(QEglFSScreen *screen) const; @@ -106,8 +106,9 @@ Qt::ScreenOrientation QEglFSAndroidHooks::nativeOrientation() const return QAndroidPlatformIntegration::m_nativeOrientation; } -EGLNativeWindowType QEglFSAndroidHooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format) +EGLNativeWindowType QEglFSAndroidHooks::createNativeWindow(QPlatformWindow *platformWindow, const QSize &size, const QSurfaceFormat &format) { + Q_UNUSED(platformWindow); Q_UNUSED(size); Q_UNUSED(format); ANativeWindow *window = QtAndroid::nativeWindow(); -- cgit v1.2.3