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

Conflicts:
	src/plugins/platforms/minimal/qminimalintegration.cpp
	src/plugins/platforms/offscreen/qoffscreenintegration.cpp

Change-Id: Ica85deeab5c5038ac004718e25194b1157343480

4 files changed, 21 insertions, 1 deletions

diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 9d603bb08d..2a9cac352d 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -537,6 +537,14 @@ QFontEngineData::~QFontEngineData()
 */
 
 /*!
+    \fn QFont &QFont::operator=(QFont &&other)
+
+    Move-assigns \a other to this QFont instance.
+
+    \since 5.2
+*/
+
+/*!
     \fn QString QFont::rawName() const
 
     Returns the name of the font within the underlying window system.
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 160d66c96c..1d0a1c1078 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -213,6 +213,14 @@ QFontMetrics &QFontMetrics::operator=(const QFontMetrics &fm)
 }
 
 /*!
+    \fn QFontMetrics &QFontMetrics::operator=(QFontMetrics &&other)
+
+    Move-assigns \a other to this QFontMetrics instance.
+
+    \since 5.2
+*/
+
+/*!
     \fn void QFontMetrics::swap(QFontMetrics &other)
     \since 5.0
 
diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp
index c939020457..1284207307 100644
--- a/src/gui/text/qtextoption.cpp
+++ b/src/gui/text/qtextoption.cpp
@@ -61,6 +61,7 @@ QTextOption::QTextOption()
       wordWrap(QTextOption::WordWrap),
       design(false),
       unused(0),
+      unused2(0),
       f(0),
       tab(-1),
       d(0)
@@ -78,6 +79,7 @@ QTextOption::QTextOption(Qt::Alignment alignment)
       wordWrap(QTextOption::WordWrap),
       design(false),
       unused(0),
+      unused2(0),
       f(0),
       tab(-1),
       d(0)
@@ -104,6 +106,7 @@ QTextOption::QTextOption(const QTextOption &o)
       design(o.design),
       direction(o.direction),
       unused(o.unused),
+      unused2(o.unused2),
       f(o.f),
       tab(o.tab),
       d(0)
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h
index a6818eb79a..3c76768f87 100644
--- a/src/gui/text/qtextoption.h
+++ b/src/gui/text/qtextoption.h
@@ -134,7 +134,8 @@ private:
     uint wordWrap : 4;
     uint design : 1;
     uint direction : 2;
-    uint unused : 18;
+    uint unused : 17;
+    uint unused2; // ### Qt 6: remove unnecessary, extra 32 bits
     uint f;
     qreal tab;
     QTextOptionPrivate *d;