Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/testlib/qtestblacklist.cpp
	src/widgets/accessible/qaccessiblewidgets.cpp

Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c

1 files changed, 9 insertions, 9 deletions

diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h
index 90340bb360..43c1f4e197 100644
--- a/src/corelib/tools/qunicodetables_p.h
+++ b/src/corelib/tools/qunicodetables_p.h
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-/* This file is autogenerated from the Unicode 6.3 database. Do not edit */
+/* This file is autogenerated from the Unicode 7.0 database. Do not edit */
 
 //
 //  W A R N I N G
@@ -51,7 +51,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#define UNICODE_DATA_VERSION QChar::Unicode_6_3
+#define UNICODE_DATA_VERSION QChar::Unicode_7_0
 
 namespace QUnicodeTables {
 
@@ -60,23 +60,23 @@ struct Properties {
     ushort direction           : 8; /* 5 used */
     ushort combiningClass      : 8;
     ushort joining             : 3;
-    signed short digitValue    : 5; /* 5 used */
+    signed short digitValue    : 5;
     signed short mirrorDiff    : 16;
-    signed short lowerCaseDiff : 16;
-    signed short upperCaseDiff : 16;
-    signed short titleCaseDiff : 16;
-    signed short caseFoldDiff  : 16;
     ushort lowerCaseSpecial    : 1;
+    signed short lowerCaseDiff : 15;
     ushort upperCaseSpecial    : 1;
+    signed short upperCaseDiff : 15;
     ushort titleCaseSpecial    : 1;
+    signed short titleCaseDiff : 15;
     ushort caseFoldSpecial     : 1;
-    ushort unicodeVersion      : 4;
+    signed short caseFoldDiff  : 15;
+    ushort unicodeVersion      : 8; /* 5 used */
     ushort nfQuickCheck        : 8;
     ushort graphemeBreakClass  : 4; /* 4 used */
     ushort wordBreakClass      : 4; /* 4 used */
     ushort sentenceBreakClass  : 8; /* 4 used */
     ushort lineBreakClass      : 8; /* 6 used */
-    ushort script              : 8; /* 7 used */
+    ushort script              : 8;
 };
 
 Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) Q_DECL_NOTHROW;