diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-05-31 12:05:26 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-05-31 12:05:39 +0200 |
| commit | dece229a7c2284598c36fb668de766309a6893cf (patch) | |
| tree | 6e34cfa52416b2f27d2fa0631cf34f8ffd171be4 /src/quick/scenegraph/util/qsgtexture.cpp | |
| parent | e2520ff76be49c5aa917741cc6a380fe1549e47d (diff) | |
| parent | c158ca8be49a75026e83751dfd825c5bdd63189a (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Iea0bb0788357bc615d0e9ea411087114b8b3b720
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp index 3432a87c53..4f11d95e70 100644 --- a/src/quick/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -811,7 +811,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 @@ -918,3 +918,6 @@ void QSGPlainTexture::bind() QT_END_NAMESPACE + +#include "moc_qsgtexture.cpp" +#include "moc_qsgtexture_p.cpp" |