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

 Conflicts:
	src/corelib/tools/qhash.h
	src/gui/kernel/qevent.h
	src/widgets/kernel/qshortcut.cpp
	src/widgets/kernel/qshortcut.h

Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620

1 files changed, 8 insertions, 11 deletions

diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index 76b9757eba..f069951ce5 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -303,10 +303,7 @@ struct QScriptItem;
 class QTextItemInt : public QTextItem
 {
 public:
-    inline QTextItemInt()
-        : justified(false), underlineStyle(QTextCharFormat::NoUnderline), num_chars(0), chars(nullptr),
-          logClusters(nullptr), f(nullptr), fontEngine(nullptr)
-    {}
+    inline QTextItemInt() = default;
     QTextItemInt(const QScriptItem &si, QFont *font, const QTextCharFormat &format = QTextCharFormat());
     QTextItemInt(const QGlyphLayout &g, QFont *font, const QChar *chars, int numChars, QFontEngine *fe,
                  const QTextCharFormat &format = QTextCharFormat());
@@ -321,16 +318,16 @@ public:
     QFixed width;
 
     RenderFlags flags;
-    bool justified;
-    QTextCharFormat::UnderlineStyle underlineStyle;
+    bool justified = false;
+    QTextCharFormat::UnderlineStyle underlineStyle = QTextCharFormat::NoUnderline;
     const QTextCharFormat charFormat;
-    int num_chars;
-    const QChar *chars;
-    const unsigned short *logClusters;
-    const QFont *f;
+    int num_chars = 0;
+    const QChar *chars = nullptr;
+    const unsigned short *logClusters = nullptr;
+    const QFont *f = nullptr;
 
     QGlyphLayout glyphs;
-    QFontEngine *fontEngine;
+    QFontEngine *fontEngine = nullptr;
 };
 
 struct QScriptItem