diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:36:55 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:36:55 +0200 |
| commit | 98d3e40fb7c88b670a93e73dace2d0f05a5f903c (patch) | |
| tree | b1292124a86c219fb434db4ec28e8f805ff52287 /src/plugins/platforms/android/qandroidplatformopenglcontext.cpp | |
| parent | a74e4b85be83e2da47f4a1d8fcf0e78079335b80 (diff) | |
| parent | bab494e4d046f5617d19f5fec35eeff94377c51f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-armv7le-qcc/qplatformdefs.h
src/printsupport/kernel/qcups.cpp
src/widgets/styles/qstyle.h
tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformopenglcontext.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformopenglcontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp b/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp index 289480c625..152a06c99d 100644 --- a/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp +++ b/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp @@ -71,7 +71,8 @@ bool QAndroidPlatformOpenGLContext::needsFBOReadBackWorkaroud() const char *rendererString = reinterpret_cast<const char *>(glGetString(GL_RENDERER)); needsWorkaround = qstrcmp(rendererString, "Mali-400 MP") == 0 - || qstrcmp(rendererString, "Adreno (TM) 200") == 0; + || qstrcmp(rendererString, "Adreno (TM) 200") == 0 + || qstrcmp(rendererString, "GC1000 core") == 0; set = true; } |