3 files changed, 4 insertions, 14 deletions
diff --git a/src/gui/util/qgridlayoutengine.cpp b/src/gui/util/qgridlayoutengine.cpp
index 4af5e47f8f..f2d549b48f 100644
--- a/src/gui/util/qgridlayoutengine.cpp
+++ b/src/gui/util/qgridlayoutengine.cpp
@@ -960,7 +960,7 @@ void QGridLayoutEngine::insertItem(QGridLayoutItem *item, int index)
 {
     maybeExpandGrid(item->lastRow(), item->lastColumn());
 
-    if (index == -1)
+    if (index < 0 || index >= q_items.size())
         q_items.append(item);
     else
         q_items.insert(index, item);
@@ -1336,7 +1336,7 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData,
             if (rowIsIdenticalToPrevious && item != itemAt(row - 1, column, orientation))
                 rowIsIdenticalToPrevious = false;
 
-            if (item && !item->isIgnored())
+            if (item && !item->isEmpty())
                 rowIsEmpty = false;
         }
 
diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h
index 181326103b..908aeda0c3 100644
--- a/src/gui/util/qgridlayoutengine_p.h
+++ b/src/gui/util/qgridlayoutengine_p.h
@@ -303,7 +303,7 @@ public:
 
     virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const = 0;
     virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const = 0;
-    virtual bool isIgnored() const { return false; }
+    virtual bool isEmpty() const { return false; }
 
     virtual void setGeometry(const QRectF &rect) = 0;
     /*
diff --git a/src/gui/util/qtexturefiledata.cpp b/src/gui/util/qtexturefiledata.cpp
index 41cbd1b15a..3c8130c229 100644
--- a/src/gui/util/qtexturefiledata.cpp
+++ b/src/gui/util/qtexturefiledata.cpp
@@ -38,11 +38,7 @@
 ****************************************************************************/
 
 #include "qtexturefiledata_p.h"
-#include <QMetaEnum>
 #include <QSize>
-#if QT_CONFIG(opengl)
-#include <QOpenGLTexture>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -247,13 +243,7 @@ void QTextureFileData::setLogName(const QByteArray &name)
 
 static QByteArray glFormatName(quint32 fmt)
 {
-    const char *id = nullptr;
-#if QT_CONFIG(opengl)
-    id = QMetaEnum::fromType<QOpenGLTexture::TextureFormat>().valueToKey(fmt);
-#endif
-    QByteArray res(id ? id : "(?)");
-    res += " [0x" + QByteArray::number(fmt, 16).rightJustified(4, '0') + ']';
-    return res;
+    return QByteArray("0x" + QByteArray::number(fmt, 16).rightJustified(4, '0'));
 }
 
 QDebug operator<<(QDebug dbg, const QTextureFileData &d)