diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-04-05 12:09:51 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-04-05 12:11:13 +0200 |
| commit | 60da655dff4ffcc94d32a05bb5fa32240b0eaa0b (patch) | |
| tree | 3f3f9d427570d505d8249053e9646af69a95e783 /src/quick/scenegraph/util/qsgatlastexture.cpp | |
| parent | 17d435fd8b2ed3a8ac6f93d17d0e78cd61bd7851 (diff) | |
| parent | fcbbedc3c21ff69d9251264dd708d6ca66c09359 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I57b06e2e98beb010a56dd0593d93e078ecf76eea
Diffstat (limited to 'src/quick/scenegraph/util/qsgatlastexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 2 |
1 files changed, 1 insertions, 1 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 |