4 files changed, 8 insertions, 3 deletions
diff --git a/src/layouts/qgridlayoutengine.cpp b/src/layouts/qgridlayoutengine.cpp
index 11188d564..ae5da09ea 100644
--- a/src/layouts/qgridlayoutengine.cpp
+++ b/src/layouts/qgridlayoutengine.cpp
@@ -497,6 +497,10 @@ QGridLayoutItem::QGridLayoutItem(/*QGridLayoutEngine *engine, */
     //q_engine->insertItem(this, itemAtIndex);###
 }
 
+QGridLayoutItem::~QGridLayoutItem()
+{
+}
+
 int QGridLayoutItem::firstRow(Qt::Orientation orientation) const
 {
     return q_firstRows[orientation == Qt::Vertical];
diff --git a/src/layouts/qgridlayoutengine_p.h b/src/layouts/qgridlayoutengine_p.h
index 86dec9552..27372dcbf 100644
--- a/src/layouts/qgridlayoutengine_p.h
+++ b/src/layouts/qgridlayoutengine_p.h
@@ -344,6 +344,7 @@ class QGridLayoutItem
 public:
     QGridLayoutItem(int row, int column, int rowSpan = 1, int columnSpan = 1,
                     Qt::Alignment alignment = 0);
+    virtual ~QGridLayoutItem();
 
     inline int firstRow() const { return q_firstRows[Ver]; }
     inline int firstColumn() const { return q_firstRows[Hor]; }
diff --git a/src/layouts/qquickgridlayoutengine_p.h b/src/layouts/qquickgridlayoutengine_p.h
index 5e85f4d04..54a885653 100644
--- a/src/layouts/qquickgridlayoutengine_p.h
+++ b/src/layouts/qquickgridlayoutengine_p.h
@@ -201,7 +201,7 @@ SizePolicy | Layout.horizontalSizePolicy    | Expanding if layout, Fixed if item
 
         // If that fails, make an ultimate fallback to width/height
 
-        if ( (!info && prefWidth <= 0) || (prefHeight <= 0))
+        if (!info && (prefWidth <= 0 || prefHeight <= 0))
             info = static_cast<QQuickLayoutAttached *>(qmlAttachedPropertiesObject<QQuickLayout>(m_item));
 
         const bool was = info->setChangesNotificationEnabled(false);
diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp
index caa83660d..62afbdb53 100644
--- a/src/layouts/qquicklinearlayout.cpp
+++ b/src/layouts/qquicklinearlayout.cpp
@@ -290,8 +290,8 @@ void QQuickGridLayoutBase::onItemDestroyed()
 
 void QQuickGridLayoutBase::onItemImplicitSizeChanged()
 {
-    QQuickItem *item = static_cast<QQuickItem *>(sender());
-    Q_ASSERT(item);
+    //QQuickItem *item = static_cast<QQuickItem *>(sender());
+    //Q_ASSERT(item);
     //invalidate(item);
 }