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

 Conflicts:
	src/widgets/styles/qstylesheetstyle.cpp

Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad

1 files changed, 5 insertions, 8 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.h b/src/plugins/platforms/cocoa/qcocoakeymapper.h
index a75e275077..2624f19978 100644
--- a/src/plugins/platforms/cocoa/qcocoakeymapper.h
+++ b/src/plugins/platforms/cocoa/qcocoakeymapper.h
@@ -89,15 +89,12 @@ public:
     void clearMappings();
 
 private:
-    QCFType<TISInputSourceRef> currentInputSource;
+    QCFType<TISInputSourceRef> currentInputSource = nullptr;
 
-    enum { NullMode, UnicodeMode, OtherMode } keyboard_mode;
-    union {
-        const UCKeyboardLayout *unicode;
-        void *other;
-    } keyboard_layout_format;
-    KeyboardLayoutKind keyboard_kind;
-    UInt32 keyboard_dead;
+    enum { NullMode, UnicodeMode, OtherMode } keyboard_mode = NullMode;
+    const UCKeyboardLayout *keyboard_layout_format = nullptr;
+    KeyboardLayoutKind keyboard_kind = kKLKCHRuchrKind;
+    UInt32 keyboard_dead = 0;
     KeyboardLayoutItem *keyLayout[256];
 };