Fix build on iOS
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>
Tue, 19 Nov 2013 16:28:34 +0000 (17:28 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 19 Nov 2013 16:45:21 +0000 (17:45 +0100)
Icccd542b8122c7bfa0e83 and Ia6e9f06dbb850 clashed.

Change-Id: Iaea844c9955eb29104ee32660499a67cb7224cbf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
src/quick/scenegraph/util/qsgtexture.cpp

index abf3002..51b3baf 100644 (file)
@@ -693,7 +693,7 @@ void QSGPlainTexture::bind()
         externalFormat = GL_BGRA;
         internalFormat = GL_BGRA;
 #ifdef Q_OS_IOS
-    } else if (strstr(extensions, "GL_APPLE_texture_format_BGRA8888")) {
+    } else if (context->hasExtension(QByteArrayLiteral("GL_APPLE_texture_format_BGRA8888"))) {
         externalFormat = GL_BGRA;
         internalFormat = GL_RGBA;
 #endif