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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix compilation with QT_NO_KEYWORDS
  Replaced sample text for Japanese font
  Fix the #ifdef position.
  Deactivate the auto-test on problematic platforms.
  Enable the unified toolbar with the raster
  configure: Don't use character class when looking for QMAKE_CONF_COMPILER
  Moving the resetInternalData slot to QAbstractProxyModel
  Provide the resetInternalData slot to cleanly reset data in proxy subclasses.
  Emit beginResetModel before updating the strings.
  Send the hoverLeave not properly sent on the widget inside QGPW.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 2b2663849e..9ed09c2bbe 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -2423,10 +2423,12 @@ QString QFontDatabase::writingSystemSample(WritingSystem writingSystem)
         sample += QChar(0x4f8b);
         break;
     case Japanese:
-        sample += QChar(0x3050);
-        sample += QChar(0x3060);
-        sample += QChar(0x30b0);
-        sample += QChar(0x30c0);
+        sample += QChar(0x30b5);
+        sample += QChar(0x30f3);
+        sample += QChar(0x30d7);
+        sample += QChar(0x30eb);
+        sample += QChar(0x3067);
+        sample += QChar(0x3059);
         break;
     case Korean:
         sample += QChar(0xac00);