diff options
| author | Tor Arne Vestbø <[email protected]> | 2020-10-06 18:35:01 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <[email protected]> | 2020-10-07 13:03:27 +0200 |
| commit | 4ef79853528dcc908ad3737f7bebf38b059de959 (patch) | |
| tree | 68385234f27dbacb7af5a5ca6a0f01842d84324a /src | |
| parent | af9197ff91a7db229854b502b7634706cde0e547 (diff) | |
Rename Android offscreen surface interface
The convention for these interfaces is to not have 'platform' in
their name.
Change-Id: I4af831861b58dcfc2538d4206788231b9ec3a766
Reviewed-by: Assam Boudjelthia <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qoffscreensurface_platform.h | 4 | ||||
| -rw-r--r-- | src/gui/platform/android/qandroidplatforminterface.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformoffscreensurface.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qoffscreensurface_platform.h b/src/gui/kernel/qoffscreensurface_platform.h index 87e6b453a72..c991ec01225 100644 --- a/src/gui/kernel/qoffscreensurface_platform.h +++ b/src/gui/kernel/qoffscreensurface_platform.h @@ -52,9 +52,9 @@ QT_BEGIN_NAMESPACE namespace QPlatformInterface { #if defined(Q_OS_ANDROID) -struct Q_GUI_EXPORT QAndroidPlatformOffscreenSurface +struct Q_GUI_EXPORT QAndroidOffscreenSurface { - QT_DECLARE_PLATFORM_INTERFACE(QAndroidPlatformOffscreenSurface) + QT_DECLARE_PLATFORM_INTERFACE(QAndroidOffscreenSurface) static QOffscreenSurface *fromNative(ANativeWindow *nativeSurface); virtual ANativeWindow *nativeSurface() const = 0; }; diff --git a/src/gui/platform/android/qandroidplatforminterface.cpp b/src/gui/platform/android/qandroidplatforminterface.cpp index a3c4a5028d4..0a2c708d7ae 100644 --- a/src/gui/platform/android/qandroidplatforminterface.cpp +++ b/src/gui/platform/android/qandroidplatforminterface.cpp @@ -48,10 +48,10 @@ QT_BEGIN_NAMESPACE using namespace QPlatformInterface::Private; #if defined(Q_OS_ANDROID) -QT_DEFINE_PLATFORM_INTERFACE(QAndroidPlatformOffscreenSurface, QOffscreenSurface); +QT_DEFINE_PLATFORM_INTERFACE(QAndroidOffscreenSurface, QOffscreenSurface); QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QAndroidOffScreenIntegration); -QOffscreenSurface *QPlatformInterface::QAndroidPlatformOffscreenSurface::fromNative(ANativeWindow *nativeSurface) +QOffscreenSurface *QPlatformInterface::QAndroidOffscreenSurface::fromNative(ANativeWindow *nativeSurface) { return QGuiApplicationPrivate::platformIntegration()->call< &QAndroidOffScreenIntegration::createOffscreenSurface>(nativeSurface); diff --git a/src/plugins/platforms/android/qandroidplatformoffscreensurface.h b/src/plugins/platforms/android/qandroidplatformoffscreensurface.h index 3cfeab3bf22..3eef7275961 100644 --- a/src/plugins/platforms/android/qandroidplatformoffscreensurface.h +++ b/src/plugins/platforms/android/qandroidplatformoffscreensurface.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QOffscreenSurface; class QAndroidPlatformOffscreenSurface : public QPlatformOffscreenSurface, - public QPlatformInterface::QAndroidPlatformOffscreenSurface + public QPlatformInterface::QAndroidOffscreenSurface { public: QAndroidPlatformOffscreenSurface(ANativeWindow *nativeSurface, EGLDisplay display, QOffscreenSurface *offscreenSurface); |