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

Conflicts:
	examples/examples.pro
	tests/auto/corelib/tools/qchar/tst_qchar.cpp
	tests/auto/other/qaccessibility/accessiblewidgets.h

Change-Id: I426696c40ab57d14dc295b8103152cede79f244c

1 files changed, 62 insertions, 62 deletions

diff --git a/src/tools/qlalr/grammar_p.h b/src/tools/qlalr/grammar_p.h
index 1230a29b1c..8482f9bfe1 100644
--- a/src/tools/qlalr/grammar_p.h
+++ b/src/tools/qlalr/grammar_p.h
@@ -48,68 +48,68 @@ QT_BEGIN_NAMESPACE
 class grammar
 {
 public:
-  enum VariousConstants {
-    EOF_SYMBOL = 0,
-    COLON = 16,
-    DECL = 19,
-    DECL_FILE = 3,
-    ERROR = 21,
-    EXPECT = 4,
-    EXPECT_RR = 5,
-    ID = 1,
-    IMPL = 20,
-    IMPL_FILE = 6,
-    LEFT = 7,
-    MERGED_OUTPUT = 8,
-    NONASSOC = 9,
-    OR = 17,
-    PARSER = 10,
-    PREC = 11,
-    RIGHT = 12,
-    SEMICOLON = 18,
-    START = 13,
-    STRING_LITERAL = 2,
-    TOKEN = 14,
-    TOKEN_PREFIX = 15,
-
-    ACCEPT_STATE = 68,
-    RULE_COUNT = 45,
-    STATE_COUNT = 69,
-    TERMINAL_COUNT = 22,
-    NON_TERMINAL_COUNT = 24,
-
-    GOTO_INDEX_OFFSET = 69,
-    GOTO_INFO_OFFSET = 76,
-    GOTO_CHECK_OFFSET = 76
-  };
-
-  static const char  *const    spell [];
-  static const short             lhs [];
-  static const short             rhs [];
-  static const short    goto_default [];
-  static const short  action_default [];
-  static const short    action_index [];
-  static const short     action_info [];
-  static const short    action_check [];
-
-  static inline int nt_action (int state, int nt)
-  {
-    const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;
-    if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)
-      return goto_default [nt];
-
-    return action_info [GOTO_INFO_OFFSET + yyn];
-  }
-
-  static inline int t_action (int state, int token)
-  {
-    const int yyn = action_index [state] + token;
-
-    if (yyn < 0 || action_check [yyn] != token)
-      return - action_default [state];
-
-    return action_info [yyn];
-  }
+    enum VariousConstants {
+        EOF_SYMBOL = 0,
+        COLON = 16,
+        DECL = 19,
+        DECL_FILE = 3,
+        ERROR = 21,
+        EXPECT = 4,
+        EXPECT_RR = 5,
+        ID = 1,
+        IMPL = 20,
+        IMPL_FILE = 6,
+        LEFT = 7,
+        MERGED_OUTPUT = 8,
+        NONASSOC = 9,
+        OR = 17,
+        PARSER = 10,
+        PREC = 11,
+        RIGHT = 12,
+        SEMICOLON = 18,
+        START = 13,
+        STRING_LITERAL = 2,
+        TOKEN = 14,
+        TOKEN_PREFIX = 15,
+
+        ACCEPT_STATE = 68,
+        RULE_COUNT = 45,
+        STATE_COUNT = 69,
+        TERMINAL_COUNT = 22,
+        NON_TERMINAL_COUNT = 24,
+
+        GOTO_INDEX_OFFSET = 69,
+        GOTO_INFO_OFFSET = 57,
+        GOTO_CHECK_OFFSET = 57
+    };
+
+    static const char *const     spell[];
+    static const short             lhs[];
+    static const short             rhs[];
+    static const short    goto_default[];
+    static const short  action_default[];
+    static const short    action_index[];
+    static const short     action_info[];
+    static const short    action_check[];
+
+    static inline int nt_action (int state, int nt)
+    {
+        const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;
+        if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)
+            return goto_default [nt];
+
+        return action_info [GOTO_INFO_OFFSET + yyn];
+    }
+
+    static inline int t_action (int state, int token)
+    {
+        const int yyn = action_index [state] + token;
+
+        if (yyn < 0 || action_check [yyn] != token)
+            return - action_default [state];
+
+        return action_info [yyn];
+    }
 };