From e95e9c28f07e22ea76a7a5521c090a785133dbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 14 Oct 2021 13:00:02 +0200 Subject: QWidget: Don't rely on topextra to determine if window is top level Doing so results in bailing out early for a widget that hasn't been shown yet, or otherwise resulted in creating extra and topextra, which means the normalGeometry will not reflect the widget's geometry. Pick-to: 6.2 Change-Id: Ieb85e9a6109ae34fe20d79e3c12f4517f827a590 Reviewed-by: Volker Hilsheimer --- src/widgets/kernel/qwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets/kernel/qwidget.cpp') diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 2534a7aeba..d5a0e92fac 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -3668,7 +3668,7 @@ QPoint QWidget::pos() const QRect QWidget::normalGeometry() const { Q_D(const QWidget); - if (!d->extra || !d->extra->topextra) + if (!isWindow()) return QRect(); if (!isMaximized() && !isFullScreen()) -- cgit v1.2.3