diff options
| author | Eirik Aavitsland <[email protected]> | 2016-03-18 10:08:59 +0100 |
|---|---|---|
| committer | aavit <[email protected]> | 2016-04-01 14:48:16 +0000 |
| commit | f5afec250cc63ba3a7b1cc78f51d5eb0031dd478 (patch) | |
| tree | 2d1c4065b752d90a32d8181f0fbd2909fa39df4f /src/quick/scenegraph | |
| parent | 0e010cd9d25c472eaad8f8352e8478597ba7569a (diff) | |
Remove traces of the discontinued android-no-sdk platform
Change-Id: Ie734d6bfcb492c8aeeb18909650a27b1288f2b52
Reviewed-by: Robin Burchell <[email protected]>
Reviewed-by: Frank Meerkoetter <[email protected]>
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp index 57468e5799..68dc813933 100644 --- a/src/quick/scenegraph/util/qsgatlastexture.cpp +++ b/src/quick/scenegraph/util/qsgatlastexture.cpp @@ -137,7 +137,7 @@ Atlas::Atlas(const QSize &size) if (QOpenGLContext::currentContext()->isOpenGLES()) { #endif -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) QString *deviceName = static_cast<QString *>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("AndroidDeviceName")); static bool wrongfullyReportsBgra8888Support = deviceName != 0 diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp index 74390334c4..9b9c77dce4 100644 --- a/src/quick/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -716,7 +716,7 @@ void QSGPlainTexture::bind() GLenum externalFormat = GL_RGBA; GLenum internalFormat = GL_RGBA; -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) QString *deviceName = static_cast<QString *>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("AndroidDeviceName")); static bool wrongfullyReportsBgra8888Support = deviceName != 0 |