From: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Date: Tue, 19 Nov 2013 16:28:34 +0000 (+0100)
Subject: Fix build on iOS
X-Git-Tag: upstream/5.2.1~1^2~13^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13158e4bc3bd225210f9b04ca0de129be7107051;p=platform%2Fupstream%2Fqtdeclarative.git

Fix build on iOS

Icccd542b8122c7bfa0e83 and Ia6e9f06dbb850 clashed.

Change-Id: Iaea844c9955eb29104ee32660499a67cb7224cbf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---

diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index abf3002..51b3baf 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -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