3 files changed, 13 insertions, 6 deletions
diff --git a/src/imports/layouts/qquickstacklayout.cpp b/src/imports/layouts/qquickstacklayout.cpp
index d6ee4afe84..1d67d2058d 100644
--- a/src/imports/layouts/qquickstacklayout.cpp
+++ b/src/imports/layouts/qquickstacklayout.cpp
@@ -192,10 +192,8 @@ QSizeF QQuickStackLayout::sizeHint(Qt::SizeHint whichSizeHint) const
         maxS = QSizeF(std::numeric_limits<qreal>::infinity(), std::numeric_limits<qreal>::infinity());
 
         const int count = itemCount();
-        m_cachedItemSizeHints.resize(count);
         for (int i = 0; i < count; ++i) {
-            SizeHints &hints = m_cachedItemSizeHints[i];
-            QQuickStackLayout::collectItemSizeHints(itemAt(i), hints.array);
+            SizeHints &hints = cachedItemSizeHints(i);
             minS = minS.expandedTo(hints.min());
             prefS = prefS.expandedTo(hints.pref());
             //maxS = maxS.boundedTo(hints.max());       // Can be resized to be larger than any of its items.
@@ -286,6 +284,7 @@ void QQuickStackLayout::updateLayoutItems()
     if (count != d->count) {
         d->count = count;
         emit countChanged();
+        m_cachedItemSizeHints.resize(count);
     }
     for (int i = 0; i < count; ++i) {
         QQuickItem *child = itemAt(i);
@@ -294,6 +293,13 @@ void QQuickStackLayout::updateLayoutItems()
     }
 }
 
+QQuickStackLayout::SizeHints &QQuickStackLayout::cachedItemSizeHints(int index) const {
+    SizeHints &hints = m_cachedItemSizeHints[index];
+    if (!hints.min().isValid())
+        QQuickStackLayout::collectItemSizeHints(itemAt(index), hints.array);
+    return hints;
+}
+
 void QQuickStackLayout::rearrange(const QSizeF &newSize)
 {
     Q_D(QQuickStackLayout);
@@ -305,7 +311,7 @@ void QQuickStackLayout::rearrange(const QSizeF &newSize)
 
     if (d->currentIndex == -1 || d->currentIndex >= m_cachedItemSizeHints.count())
         return;
-    QQuickStackLayout::SizeHints &hints = m_cachedItemSizeHints[d->currentIndex];
+    QQuickStackLayout::SizeHints &hints = cachedItemSizeHints(d->currentIndex);
     QQuickItem *item = itemAt(d->currentIndex);
     Q_ASSERT(item);
     item->setPosition(QPointF(0,0));    // ### respect alignment?
diff --git a/src/imports/layouts/qquickstacklayout_p.h b/src/imports/layouts/qquickstacklayout_p.h
index 0319e259d4..5349adfa36 100644
--- a/src/imports/layouts/qquickstacklayout_p.h
+++ b/src/imports/layouts/qquickstacklayout_p.h
@@ -97,6 +97,7 @@ private:
 
     mutable QVector<SizeHints> m_cachedItemSizeHints;
     mutable QSizeF m_cachedSizeHints[Qt::NSizeHints];
+    SizeHints &cachedItemSizeHints(int index) const;
 };
 
 class QQuickStackLayoutPrivate : public QQuickLayoutPrivate
diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp
index 8c37f8368f..eb7095bc2a 100644
--- a/src/imports/statemachine/signaltransition.cpp
+++ b/src/imports/statemachine/signaltransition.cpp
@@ -166,7 +166,7 @@ void SignalTransition::connectTriggered()
 
     Q_ASSERT(m_bindings.count() == 1);
     const QV4::CompiledData::Binding *binding = m_bindings.at(0);
-    Q_ASSERT(binding->type == QV4::CompiledData::Binding::Type_Script);
+    Q_ASSERT(binding->type() == QV4::CompiledData::Binding::Type_Script);
 
     QV4::ExecutionEngine *jsEngine = QQmlEngine::contextForObject(this)->engine()->handle();
     QV4::Scope scope(jsEngine);
@@ -198,7 +198,7 @@ void SignalTransitionParser::verifyBindings(const QQmlRefPointer<QV4::Executable
             return;
         }
 
-        if (binding->type != QV4::CompiledData::Binding::Type_Script) {
+        if (binding->type() != QV4::CompiledData::Binding::Type_Script) {
             error(binding, SignalTransition::tr("SignalTransition: script expected"));
             return;
         }