Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Move separator skipping to proper place
  Skip shaping for hidden line/paragraph separators
  Support interface orientation for uikit.
  Add support for opening LinuxInput devices exclusively ('grabbing').
  Fixed regression in compilerwarnings.
  Properly quit the input event thread in the directfb platform plugin.
  Apply 57993ba7 properly to 4.8
  Deprecate some QPixmap functions (marked as obsolete already).
  Deprecate some functions in QImage (that have been obsolete since 4.1).
  Add QLocale::toUpper/Lower
  Fix warning for uninitialized variable

1 files changed, 12 insertions, 8 deletions

diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp
index b26121c..214b2f3 100644
--- a/tests/auto/qstring/tst_qstring.cpp
+++ b/tests/auto/qstring/tst_qstring.cpp
@@ -5103,24 +5103,28 @@ void tst_QString::toUpperLower_icu()
 
     QLocale::setDefault(QLocale(QLocale::Turkish, QLocale::Turkey));
 
+    QCOMPARE(s.toUpper(), QString::fromLatin1("I"));
+    QCOMPARE(s.toLower(), QString::fromLatin1("i"));
+
     // turkish locale has a capital I with a dot (U+0130, utf8 c4b0)
+    QLocale l;
 
-    QCOMPARE(s.toUpper(), QString::fromUtf8("\xc4\xb0"));
-    QCOMPARE(QString::fromUtf8("\xc4\xb0").toLower(), s);
+    QCOMPARE(l.toUpper(s), QString::fromUtf8("\xc4\xb0"));
+    QCOMPARE(l.toLower(QString::fromUtf8("\xc4\xb0")), s);
 
     // nothing should happen here
-    QCOMPARE(s.toLower(), s);
-    QCOMPARE(QString::fromLatin1("I").toUpper(), QString::fromLatin1("I"));
+    QCOMPARE(l.toLower(s), s);
+    QCOMPARE(l.toUpper(QString::fromLatin1("I")), QString::fromLatin1("I"));
 
     // U+0131, utf8 c4b1 is the lower-case i without a dot
     QString sup = QString::fromUtf8("\xc4\xb1");
 
-    QCOMPARE(sup.toUpper(), QString::fromLatin1("I"));
-    QCOMPARE(QString::fromLatin1("I").toLower(), sup);
+    QCOMPARE(l.toUpper(sup), QString::fromLatin1("I"));
+    QCOMPARE(l.toLower(QString::fromLatin1("I")), sup);
 
     // nothing should happen here
-    QCOMPARE(sup.toLower(), sup);
-    QCOMPARE(QString::fromLatin1("i").toLower(), QString::fromLatin1("i"));
+    QCOMPARE(l.toLower(sup), sup);
+    QCOMPARE(l.toLower(QString::fromLatin1("i")), QString::fromLatin1("i"));
 
     // the cleanup function will restore the default locale
 }