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

Conflicts:
	src/quick/items/qquickaccessibleattached_p.h
	src/quick/items/qquickwindow.cpp
	src/quick/scenegraph/qsgthreadedrenderloop.cpp

Change-Id: I8bf07487a75f9d1b0d6efa5914dd06875fc9654d

1 files changed, 7 insertions, 3 deletions

diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index 0d19a8aa83..0bef823b3c 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -243,7 +243,8 @@ void QQuickSpriteSequence::setGoalSprite(const QString &sprite)
     if (m_goalState != sprite){
         m_goalState = sprite;
         emit goalSpriteChanged(sprite);
-        m_spriteEngine->setGoal(m_spriteEngine->stateIndex(sprite));
+        if (m_spriteEngine)
+            m_spriteEngine->setGoal(m_spriteEngine->stateIndex(sprite));
     }
 }
 
@@ -257,10 +258,13 @@ void QQuickSpriteSequence::createEngine()
     //TODO: delay until component complete
     if (m_spriteEngine)
         delete m_spriteEngine;
-    if (m_sprites.count())
+    if (m_sprites.count()) {
         m_spriteEngine = new QQuickSpriteEngine(m_sprites, this);
-    else
+        if (!m_goalState.isEmpty())
+            m_spriteEngine->setGoal(m_spriteEngine->stateIndex(m_goalState));
+    } else {
         m_spriteEngine = 0;
+    }
     reset();
 }