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

Conflicts:
	src/gui/text/qfontdatabase.cpp

Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d

1 files changed, 20 insertions, 0 deletions

diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp b/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp
index 3d9c5d6de5..c9b2ecd62c 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp
+++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp
@@ -38,9 +38,29 @@
 #include "qgraphicslayoutitem_p.h"
 #include "qgraphicslayout_p.h"
 #include "qgraphicswidget.h"
+#include <private/qgraphicswidget_p.h>
 
 QT_BEGIN_NAMESPACE
 
+bool QGraphicsGridLayoutEngineItem::isHidden() const
+{
+    if (QGraphicsItem *item = q_layoutItem->graphicsItem())
+        return QGraphicsItemPrivate::get(item)->explicitlyHidden;
+    return false;
+}
+
+/*!
+  \internal
+
+  If this returns true, the layout will arrange just as if the item was never added to the layout.
+  (Note that this shouldn't lead to a "double spacing" where the item was hidden)
+  ### Qt6: Move to QGraphicsLayoutItem and make virtual
+*/
+bool QGraphicsGridLayoutEngineItem::isIgnored() const
+{
+    return isHidden() && !q_layoutItem->sizePolicy().retainSizeWhenHidden();
+}
+
 /*
   returns \c true if the size policy returns \c true for either hasHeightForWidth()
   or hasWidthForHeight()