AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Android offscreen surface interface

Browse Source 
The convention for these interfaces is to not have 'platform' in
their name.

Change-Id: I4af831861b58dcfc2538d4206788231b9ec3a766
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-10-06 18:35:01 +02:00
parent af9197ff91
commit 4ef7985352
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/kernel/qoffscreensurface_platform.h
View File

@ -52,9 +52,9 @@ QT_BEGIN_NAMESPACE
namespace QPlatformInterface { namespace QPlatformInterface {
#if defined(Q_OS_ANDROID) #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); static QOffscreenSurface *fromNative(ANativeWindow *nativeSurface);
virtual ANativeWindow *nativeSurface() const = 0; virtual ANativeWindow *nativeSurface() const = 0;
}; };

4
src/gui/platform/android/qandroidplatforminterface.cpp
View File

@ -48,10 +48,10 @@ QT_BEGIN_NAMESPACE
using namespace QPlatformInterface::Private; using namespace QPlatformInterface::Private;
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
QT_DEFINE_PLATFORM_INTERFACE(QAndroidPlatformOffscreenSurface, QOffscreenSurface); QT_DEFINE_PLATFORM_INTERFACE(QAndroidOffscreenSurface, QOffscreenSurface);
QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QAndroidOffScreenIntegration); QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QAndroidOffScreenIntegration);
QOffscreenSurface *QPlatformInterface::QAndroidPlatformOffscreenSurface::fromNative(ANativeWindow *nativeSurface) QOffscreenSurface *QPlatformInterface::QAndroidOffscreenSurface::fromNative(ANativeWindow *nativeSurface)
{ {
return QGuiApplicationPrivate::platformIntegration()->call< return QGuiApplicationPrivate::platformIntegration()->call<
&QAndroidOffScreenIntegration::createOffscreenSurface>(nativeSurface); &QAndroidOffScreenIntegration::createOffscreenSurface>(nativeSurface);

2
src/plugins/platforms/android/qandroidplatformoffscreensurface.h
View File

@ -48,7 +48,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QOffscreenSurface; class QOffscreenSurface;
class QAndroidPlatformOffscreenSurface : public QPlatformOffscreenSurface, class QAndroidPlatformOffscreenSurface : public QPlatformOffscreenSurface,
public QPlatformInterface::QAndroidPlatformOffscreenSurface public QPlatformInterface::QAndroidOffscreenSurface
{ {
public: public:
QAndroidPlatformOffscreenSurface(ANativeWindow *nativeSurface, EGLDisplay display, QOffscreenSurface *offscreenSurface); QAndroidPlatformOffscreenSurface(ANativeWindow *nativeSurface, EGLDisplay display, QOffscreenSurface *offscreenSurface);