aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/util/qsgtexture.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-04-30 10:44:29 +0200
committerLars Knoll <lars.knoll@qt.io>2017-05-02 08:40:48 +0200
commitc3e1e6390edbc28e6e528f401eb4f3639661302b (patch)
tree5c882bfe7fced9b357e80a6b56ccdc88de8a41c3 /src/quick/scenegraph/util/qsgtexture.cpp
parent9709d04ba7787c853a1ddbeed0347eab27c0924f (diff)
parent6a2febc680e163e56eb61d322d156dbf6fb07e0e (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexture.cpp')
-rw-r--r--src/quick/scenegraph/util/qsgtexture.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index bfe5642deb..1c19876a76 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -797,7 +797,7 @@ void QSGPlainTexture::bind()
GLenum externalFormat = GL_RGBA;
GLenum internalFormat = GL_RGBA;
-#if defined(Q_OS_ANDROID)
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
QString *deviceName =
static_cast<QString *>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("AndroidDeviceName"));
static bool wrongfullyReportsBgra8888Support = deviceName != 0
@@ -904,3 +904,6 @@ void QSGPlainTexture::bind()
QT_END_NAMESPACE
+
+#include "moc_qsgtexture.cpp"
+#include "moc_qsgtexture_p.cpp"