Fixed QQuickShaderEffect::lookThroughShaderCode(), added autotest.

Change-Id: I1e4a1589e1482c21eedab4cd052c16b6653344fb
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

2 files changed, 18 insertions, 12 deletions

diff --git a/src/declarative/items/qquickshadereffect.cpp b/src/declarative/items/qquickshadereffect.cpp
index ea7350df97..78c23d46e7 100644
--- a/src/declarative/items/qquickshadereffect.cpp
+++ b/src/declarative/items/qquickshadereffect.cpp
@@ -557,39 +557,45 @@ namespace {
 
             if (qt_isalpha(s[index])) {
                 // Read identifier.
-                int identifierIndex = index;
+                int idIndex = index;
                 ++index;
                 while (qt_isalnum(s[index]))
                     ++index;
-                int identifierLength = index - identifierIndex;
+                int idLength = index - idIndex;
+
+                const int attrLen = sizeof("attribute") - 1;
+                const int uniLen = sizeof("uniform") - 1;
+                const int loLen = sizeof("lowp") - 1;
+                const int medLen = sizeof("mediump") - 1;
+                const int hiLen = sizeof("highp") - 1;
 
                 switch (expected) {
                 case QualifierIdentifier:
-                    if (qstrncmp("attribute", s + identifierIndex, identifierLength) == 0) {
+                    if (idLength == attrLen && qstrncmp("attribute", s + idIndex, attrLen) == 0) {
                         decl = AttributeQualifier;
                         expected = PrecisionIdentifier;
-                    } else if (qstrncmp("uniform", s + identifierIndex, identifierLength) == 0) {
+                    } else if (idLength == uniLen && qstrncmp("uniform", s + idIndex, uniLen) == 0) {
                         decl = UniformQualifier;
                         expected = PrecisionIdentifier;
                     }
                     break;
                 case PrecisionIdentifier:
-                    if (qstrncmp("lowp", s + identifierIndex, identifierLength) == 0
-                            || qstrncmp("mediump", s + identifierIndex, identifierLength) == 0
-                            || qstrncmp("highp", s + identifierIndex, identifierLength) == 0)
+                    if ((idLength == loLen && qstrncmp("lowp", s + idIndex, loLen) == 0)
+                            || (idLength == medLen && qstrncmp("mediump", s + idIndex, medLen) == 0)
+                            || (idLength == hiLen && qstrncmp("highp", s + idIndex, hiLen) == 0))
                     {
                         expected = TypeIdentifier;
                         break;
                     }
                     // Fall through.
                 case TypeIdentifier:
-                    typeIndex = identifierIndex;
-                    typeLength = identifierLength;
+                    typeIndex = idIndex;
+                    typeLength = idLength;
                     expected = NameIdentifier;
                     break;
                 case NameIdentifier:
-                    nameIndex = identifierIndex;
-                    nameLength = identifierLength;
+                    nameIndex = idIndex;
+                    nameLength = idLength;
                     return index; // Attribute or uniform declaration found. Return result.
                 default:
                     break;
diff --git a/src/declarative/items/qquickshadereffect_p.h b/src/declarative/items/qquickshadereffect_p.h
index 257fa40aa8..ee38c3118b 100644
--- a/src/declarative/items/qquickshadereffect_p.h
+++ b/src/declarative/items/qquickshadereffect_p.h
@@ -64,7 +64,7 @@ class QSGContext;
 class QSignalMapper;
 class QQuickCustomMaterialShader;
 
-class QQuickShaderEffect : public QQuickItem
+class Q_AUTOTEST_EXPORT QQuickShaderEffect : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QByteArray fragmentShader READ fragmentShader WRITE setFragmentShader NOTIFY fragmentShaderChanged)