[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwidgets/, dev-qt/qtwidgets/files/
commit: b5e383230114250606e67244e3c06792d2543559
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 9 20:09:21 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 9 20:17:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e38323
dev-qt/qtwidgets: drop 5.15.8-r2, 5.15.8-r3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwidgets/Manifest | 1 -
.../files/qtwidgets-5.15.8-QTBUG-106569.patch | 47
dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild| 63 -
dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild| 65 --
4 files changed, 176 deletions(-)
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index f65bdbf9d40c..2acd6e73513c 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,4 +1,3 @@
DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B
0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2
SHA512
2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B
f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8
SHA512
f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B
014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4
SHA512
910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b
DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B
cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b
SHA512
29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch
b/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch
deleted file mode 100644
index c6ad77e54d44..
--- a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9a42df40228d246260cdcd40d2d582a2684439e4 Mon Sep 17 00:00:00 2001
-From: Volker Hilsheimer
-Date: Fri, 10 Feb 2023 14:49:51 +0100
-Subject: [PATCH] QAbstractItemView: don't access invalid indexes on copy-key
-
-When pressing the copy key the view tried to access the model's data for
-the currentIndex() without checking whether the index is valid. This
-resulted in debug output to the console, and might break models that
-didn't check incoming indexes for validity (or asserted validity).
-
-Fix this by checking whether the currentIndex() is valid before reading
-the model's data for that index.
-
-Fixes: QTBUG-106569
-Pick-to: 6.5 6.4 6.2 5.15
-Change-Id: Ide75fbdfdbd1451ab6d48f07b22136553c5b2468
-Reviewed-by: Richard Moe Gustavsen
-(cherry picked from commit 3a0c33da3d913431391c5b7f4f0e93ea9d2221dc)
- src/widgets/itemviews/qabstractitemview.cpp | 11 ++-
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/widgets/itemviews/qabstractitemview.cpp
b/src/widgets/itemviews/qabstractitemview.cpp
-index 5e65c59796..774b78dc4f 100644
a/src/widgets/itemviews/qabstractitemview.cpp
-+++ b/src/widgets/itemviews/qabstractitemview.cpp
-@@ -2338,11 +2338,12 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
-
- #if !defined(QT_NO_CLIPBOARD) && !defined(QT_NO_SHORTCUT)
- if (event == QKeySequence::Copy) {
--QVariant variant;
--if (d->model)
--variant = d->model->data(currentIndex(), Qt::DisplayRole);
--if (variant.canConvert())
--QGuiApplication::clipboard()->setText(variant.toString());
-+const QModelIndex index = currentIndex();
-+if (index.isValid() && d->model) {
-+const QVariant variant = d->model->data(index, Qt::DisplayRole);
-+if (variant.canConvert())
-+QGuiApplication::clipboard()->setText(variant.toString());
-+}
- event->accept();
- }
- #endif
---
-GitLab
-
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
deleted file mode 100644
index 41e6e38727ff..
--- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != ** ]]; then
- QT5_KDEPATCHSET_REV=5
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE=
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwidgets/, dev-qt/qtwidgets/files/
commit: 2b1eec972434094aba624b94a9400f69343d36ef
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 26 11:41:36 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 26 11:51:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1eec97
dev-qt/qtwidgets: Switch to QT5_KDEPATCHSET_REV=6
Contains both recent patches.
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwidgets/Manifest | 1 +
.../files/qtwidgets-5.15.8-QTBUG-104917.patch | 54 --
dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild| 7 +--
3 files changed, 2 insertions(+), 60 deletions(-)
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index db6cd834f163..f65bdbf9d40c 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,3 +1,4 @@
DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B
0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2
SHA512
2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B
f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8
SHA512
f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
+DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B
014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4
SHA512
910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b
DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B
cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b
SHA512
29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-104917.patch
b/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-104917.patch
deleted file mode 100644
index fae665b14d2e..
--- a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-104917.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 38c54b3ff58972fa16810740fc43933620b6dc0d Mon Sep 17 00:00:00 2001
-From: Axel Spoerl
-Date: Wed, 27 Jul 2022 15:17:03 +0200
-Subject: [PATCH] Add nullptr guard in
- QStyleSheetStyle::drawPrimitive(PE_PanelLineEdit)
-
-Drawing PE_PanelLineEdit in QStyleSheetStyle with the default argument
-widget = nullptr causes a segfault.
-
-drawPrimitive tries to fall back to a container widget's render rule
-and therefore calls containerWidget() - which crashes when called with
-nullptr.
-
-Container widget fallback is pointless when drawPrimitive() is called
-with widget == nullptr. This patch skips it in that case.
-
-Fixes: QTBUG-104917
-Pick-to: 6.4 6.3 6.2
-Change-Id: I09e57dccfebb81a308944c233846d5b9ef58819e
-Reviewed-by: Volker Hilsheimer
-(cherry picked from commit effc8be3ce848770a093d51d5651908c375e83f8)
- src/widgets/styles/qstylesheetstyle.cpp | 15 +--
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/src/widgets/styles/qstylesheetstyle.cpp
b/src/widgets/styles/qstylesheetstyle.cpp
-index 9fcb8ba522..50fdee0f69 100644
a/src/widgets/styles/qstylesheetstyle.cpp
-+++ b/src/widgets/styles/qstylesheetstyle.cpp
-@@ -4449,12 +4449,15 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement
pe, const QStyleOption *op
-
- case PE_PanelLineEdit:
- if (const QStyleOptionFrame *frm = qstyleoption_cast(opt)) {
--QWidget *container = containerWidget(w);
--if (container != w) {
--QRenderRule containerRule = renderRule(container, opt);
--if (!containerRule.hasNativeBorder() ||
!containerRule.baseStyleCanDraw())
--return;
--rule = containerRule;
-+// Fall back to container widget's render rule
-+if (w) {
-+QWidget *container = containerWidget(w);
-+if (container != w) {
-+QRenderRule containerRule = renderRule(container, opt);
-+if (!containerRule.hasNativeBorder() ||
!containerRule.baseStyleCanDraw())
-+return;
-+rule = containerRule;
-+}
- }
-
- if (rule.hasNativeBorder()) {
---
-2.40.0
-
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild
b/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild
index 45c06643f187..a445122d69a2 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild
@@ -4,7 +4,7 @@
EAPI=8
if [[ ${
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwidgets/, dev-qt/qtwidgets/files/
commit: d0b8c6544eaa7122509884d82f583cbb61e43786
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Mar 8 10:03:20 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 8 11:06:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b8c654
dev-qt/qtwidgets: Fix runtime crashes/UB with Ctrl-C
QAbstractItemView: don't access invalid indexes on copy-key
QTBUG: https://bugreports.qt.io/browse/QTBUG-106569
Bug: https://bugs.gentoo.org/900358
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/qtwidgets-5.15.8-QTBUG-106569.patch | 47
dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild| 65 ++
2 files changed, 112 insertions(+)
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch
b/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch
new file mode 100644
index ..c6ad77e54d44
--- /dev/null
+++ b/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch
@@ -0,0 +1,47 @@
+From 9a42df40228d246260cdcd40d2d582a2684439e4 Mon Sep 17 00:00:00 2001
+From: Volker Hilsheimer
+Date: Fri, 10 Feb 2023 14:49:51 +0100
+Subject: [PATCH] QAbstractItemView: don't access invalid indexes on copy-key
+
+When pressing the copy key the view tried to access the model's data for
+the currentIndex() without checking whether the index is valid. This
+resulted in debug output to the console, and might break models that
+didn't check incoming indexes for validity (or asserted validity).
+
+Fix this by checking whether the currentIndex() is valid before reading
+the model's data for that index.
+
+Fixes: QTBUG-106569
+Pick-to: 6.5 6.4 6.2 5.15
+Change-Id: Ide75fbdfdbd1451ab6d48f07b22136553c5b2468
+Reviewed-by: Richard Moe Gustavsen
+(cherry picked from commit 3a0c33da3d913431391c5b7f4f0e93ea9d2221dc)
+---
+ src/widgets/itemviews/qabstractitemview.cpp | 11 ++-
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/widgets/itemviews/qabstractitemview.cpp
b/src/widgets/itemviews/qabstractitemview.cpp
+index 5e65c59796..774b78dc4f 100644
+--- a/src/widgets/itemviews/qabstractitemview.cpp
b/src/widgets/itemviews/qabstractitemview.cpp
+@@ -2338,11 +2338,12 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
+
+ #if !defined(QT_NO_CLIPBOARD) && !defined(QT_NO_SHORTCUT)
+ if (event == QKeySequence::Copy) {
+-QVariant variant;
+-if (d->model)
+-variant = d->model->data(currentIndex(), Qt::DisplayRole);
+-if (variant.canConvert())
+-QGuiApplication::clipboard()->setText(variant.toString());
++const QModelIndex index = currentIndex();
++if (index.isValid() && d->model) {
++const QVariant variant = d->model->data(index, Qt::DisplayRole);
++if (variant.canConvert())
++QGuiApplication::clipboard()->setText(variant.toString());
++}
+ event->accept();
+ }
+ #endif
+--
+GitLab
+
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild
b/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild
new file mode 100644
index ..0c8b74215015
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != ** ]]; then
+ QT5_KDEPATCHSET_REV=5
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the
Qt5 framework"
+
+# keep IUSE defaults in sync with qtgui
+IUSE="dbus gles2-only gtk +png +X"
+REQUIRED_USE="gtk? ( dbus )"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
+ dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
+ gtk? (
+ dev-libs/glib:2
+ =dev-qt/qtgui-${QT5_PV}*:5=[dbus]
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/tools/uic
+ src/widgets
+ src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+ dbus:xdgdesktopportal:
+ gtk:gtk3:
+ ::widgets
+ !:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :widgets
+)
+
+PATCHES=( "${FILESDIR}/${P}-QTBUG-106569.patch" )
+
+src_configure() {
+ local myconf=(
+ -opengl $(usex gles2-only es2 desktop)
+ $(usev dbus -dbus-linked)
+ $(qt_use gtk)
+ -gui
+ $(qt_use png libpng system)
+ -widgets
+ $(qt_use X xcb)
+ $(usev X '-xcb-xlib -xkbcommon')
+ )
+ qt5-build_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwidgets/, dev-qt/qtwidgets/files/
commit: 77dc5d2fccd783c2826bc5828ad493dbf1ed5415
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 23 16:37:45 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 23 16:43:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77dc5d2f
dev-qt/qtwidgets: Revert 5.9.6 runtime regression
Reported-by: Theofilos Intzoglou gmail.com>
Tested-by: Bernd Buschinski googlemail.com>
Closes: https://bugs.gentoo.org/658520
Package-Manager: Portage-2.3.40, Repoman-2.3.9
...5.9.6-QDockWidget-revert-restore-geometry.patch | 115 +
dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild | 59 +++
2 files changed, 174 insertions(+)
diff --git
a/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch
b/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch
new file mode 100644
index 000..3123fc3e50f
--- /dev/null
+++
b/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch
@@ -0,0 +1,115 @@
+From 57bc08dac38b02128031357976436fa0f68bd574 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Wed, 20 Jun 2018 20:18:11 +0200
+Subject: [PATCH] Revert "Fix restoring geometry of dockwidget"
+
+See also: Regression caused by the fix for QTBUG-16252
+QTBUG: https://bugreports.qt.io/browse/QTBUG-68939
+
+This reverts commit cbfb6bda1d1ce3e169db6a0deb9bd901076653e4.
+---
+ src/widgets/widgets/qdockarealayout.cpp | 20 ++--
+ src/widgets/widgets/qdockarealayout_p.h | 1 -
+ 2 files changed, 2 insertions(+), 19 deletions(-)
+
+diff --git a/src/widgets/widgets/qdockarealayout.cpp
b/src/widgets/widgets/qdockarealayout.cpp
+index bef7214c75..21d1d4cb85 100644
+--- a/src/widgets/widgets/qdockarealayout.cpp
b/src/widgets/widgets/qdockarealayout.cpp
+@@ -226,7 +226,7 @@ static quintptr tabId(const QDockAreaLayoutItem &item)
+ static const int zero = 0;
+
+ QDockAreaLayoutInfo::QDockAreaLayoutInfo()
+-: restoredSizeHint(0,0), sep(&zero), dockPos(QInternal::LeftDock),
o(Qt::Horizontal), mainWindow(0)
++: sep(&zero), dockPos(QInternal::LeftDock), o(Qt::Horizontal),
mainWindow(0)
+ #if QT_CONFIG(tabbar)
+ , tabbed(false), tabBar(0), tabBarShape(QTabBar::RoundedSouth)
+ #endif
+@@ -236,7 +236,7 @@ QDockAreaLayoutInfo::QDockAreaLayoutInfo()
+ QDockAreaLayoutInfo::QDockAreaLayoutInfo(const int *_sep,
QInternal::DockPosition _dockPos,
+ Qt::Orientation _o, int tbshape,
+ QMainWindow *window)
+-: restoredSizeHint(0,0), sep(_sep), dockPos(_dockPos), o(_o),
mainWindow(window)
++: sep(_sep), dockPos(_dockPos), o(_o), mainWindow(window)
+ #if QT_CONFIG(tabbar)
+ , tabbed(false), tabBar(0),
tabBarShape(static_cast(tbshape))
+ #endif
+@@ -407,9 +407,6 @@ QSize QDockAreaLayoutInfo::sizeHint() const
+ if (isEmpty())
+ return QSize(0, 0);
+
+-if (!restoredSizeHint.isNull())
+-return restoredSizeHint;
+-
+ int a = 0, b = 0;
+ int min_perp = 0;
+ int max_perp = QWIDGETSIZE_MAX;
+@@ -2376,7 +2373,6 @@ bool QDockAreaLayout::restoreState(QDataStream &stream,
const QList> size;
+ if (!testing) {
+ docks[pos].rect = QRect(QPoint(0, 0), size);
+-docks[pos].restoredSizeHint = size;
+ }
+ if (!docks[pos].restoreState(stream, dockwidgets, testing)) {
+ stream.setStatus(QDataStream::ReadCorruptData);
+@@ -2678,8 +2674,6 @@ void QDockAreaLayout::getGrid(QVector
*_ver_struct_list,
+ center_rect.setBottom(rect.bottom() -
docks[QInternal::BottomDock].rect.height() - sep);
+
+ QSize left_hint = docks[QInternal::LeftDock].size();
+-if (!docks[QInternal::LeftDock].restoredSizeHint.isNull())
+-left_hint = docks[QInternal::LeftDock].restoredSizeHint;
+ if (left_hint.isNull() || fallbackToSizeHints)
+ left_hint = docks[QInternal::LeftDock].sizeHint();
+ QSize left_min = docks[QInternal::LeftDock].minimumSize();
+@@ -2687,8 +2681,6 @@ void QDockAreaLayout::getGrid(QVector
*_ver_struct_list,
+ left_hint = left_hint.boundedTo(left_max).expandedTo(left_min);
+
+ QSize right_hint = docks[QInternal::RightDock].size();
+-if (!docks[QInternal::RightDock].restoredSizeHint.isNull())
+-right_hint = docks[QInternal::RightDock].restoredSizeHint;
+ if (right_hint.isNull() || fallbackToSizeHints)
+ right_hint = docks[QInternal::RightDock].sizeHint();
+ QSize right_min = docks[QInternal::RightDock].minimumSize();
+@@ -2696,8 +2688,6 @@ void QDockAreaLayout::getGrid(QVector
*_ver_struct_list,
+ right_hint = right_hint.boundedTo(right_max).expandedTo(right_min);
+
+ QSize top_hint = docks[QInternal::TopDock].size();
+-if (!docks[QInternal::TopDock].restoredSizeHint.isNull())
+-top_hint = docks[QInternal::TopDock].restoredSizeHint;
+ if (top_hint.isNull() || fallbackToSi
