From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Fri, 4 Jan 2013 11:48:06 +0000 (+0100)
Subject: Merge branch 'stable' into dev
X-Git-Tag: upstream/5.2.1~961^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d150f63e1a188414e4951c4b6e4c7c474d9b4e6;p=platform%2Fupstream%2Fqtdeclarative.git

Merge branch 'stable' into dev

Conflicts:
	src/qml/qml/parser/qqmljskeywords_p.h
	sync.profile
	tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp

Change-Id: I9bc6659e1bab924009167bec567354d40a77a8cb
---

5d150f63e1a188414e4951c4b6e4c7c474d9b4e6
diff --cc src/qml/qml/parser/qqmljskeywords_p.h
index d06c996,f20627c..ae8adcc
--- a/src/qml/qml/parser/qqmljskeywords_p.h
+++ b/src/qml/qml/parser/qqmljskeywords_p.h
@@@ -329,7 -309,7 +329,7 @@@ static inline int classify5(const QCha
        if (s[2].unicode() == 'p') {
          if (s[3].unicode() == 'e') {
            if (s[4].unicode() == 'r') {
-             return qmlMode ? Lexer::T_SUPER : Lexer::T_RESERVED_WORD;
 -            return qmlMode ? int(Lexer::T_SUPER) : int(Lexer::T_IDENTIFIER);
++            return qmlMode ? int(Lexer::T_SUPER) : int(Lexer::T_RESERVED_WORD);
            }
          }
        }
diff --cc tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 70f8f48,bd92c68..1c7a087
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@@ -3065,9 -3064,8 +3064,8 @@@ void tst_qqmllanguage::literals_data(
      QTest::newRow("special8") << "c8" << QVariant(QString("\""));
      QTest::newRow("special9") << "c9" << QVariant(QString("\\"));
      // We don't handle octal escape sequences
- //    QTest::newRow("special10") << "c10" << QVariant(QString("\251"));
-     QTest::newRow("special11") << "c10" << QVariant(QString::fromLatin1("\xa9"));
-     QTest::newRow("special12") << "c11" << QVariant(QString::fromUtf8("\u00A9"));
 -    QTest::newRow("special11") << "c10" << QVariant(QString(1, QChar(0xa9)));
 -    QTest::newRow("special12") << "c11" << QVariant(QString(1, QChar(0x00A9)));
++    QTest::newRow("special10") << "c10" << QVariant(QString(1, QChar(0xa9)));
++    QTest::newRow("special11") << "c11" << QVariant(QString(1, QChar(0x00A9)));
  }
  
  void tst_qqmllanguage::literals()