aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickspritesequence
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-05-01 16:08:54 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-14 05:36:33 +0200
commit1ae19b476f4675dff954ce8dac71c1625a96c0c0 (patch)
treedeb762e9bda5a8eed6eb08d190023c0f453b25ff /tests/auto/quick/qquickspritesequence
parent4119405660d84e651abf2dd7ecabfb997be25640 (diff)
Avoid accessing sprites until they finish loading
Because sprite properties are not valid until image assembly finishes, some features of the sprite engine cannot work until sprite assembly is finished. In these circumstances, we shouldn't crash. Task-number: QTBUG-24797 Change-Id: I2701f9302620c2cfd5b7bc5ce1cb9f31be4d4e19 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickspritesequence')
-rw-r--r--tests/auto/quick/qquickspritesequence/data/crashonstart.qml74
-rw-r--r--tests/auto/quick/qquickspritesequence/tst_qquickspritesequence.cpp13
2 files changed, 87 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickspritesequence/data/crashonstart.qml b/tests/auto/quick/qquickspritesequence/data/crashonstart.qml
new file mode 100644
index 0000000000..67e09e4ace
--- /dev/null
+++ b/tests/auto/quick/qquickspritesequence/data/crashonstart.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//QTBUG-24797
+import QtQuick 2.0
+
+Rectangle {
+ width: 800
+ height: 800
+
+ SpriteSequence {
+ id: mysprite
+ sprites: [s1,s2]
+ scale: 2
+ height: 200
+ width: 200
+ anchors.centerIn: parent
+ }
+
+ Component.onCompleted: mysprite.jumpTo("running")
+ Sprite {
+ id: s1
+ name: "standing"
+ frameCount: 12
+ frameDuration: 80
+ source: "squarefacesprite.png"
+ }
+
+ Sprite {
+ id: s2
+ name: "running"
+ frameCount: 6
+ frameDuration: 80
+ source: "squarefacesprite.png"
+ }
+}
diff --git a/tests/auto/quick/qquickspritesequence/tst_qquickspritesequence.cpp b/tests/auto/quick/qquickspritesequence/tst_qquickspritesequence.cpp
index 8469a949c6..7a82cbbc65 100644
--- a/tests/auto/quick/qquickspritesequence/tst_qquickspritesequence.cpp
+++ b/tests/auto/quick/qquickspritesequence/tst_qquickspritesequence.cpp
@@ -52,6 +52,7 @@ public:
private slots:
void test_properties();
void test_framerateAdvance();//Separate codepath for QQuickSpriteEngine
+ void test_jumpToCrash();
};
void tst_qquickspritesequence::test_properties()
@@ -93,6 +94,18 @@ void tst_qquickspritesequence::test_framerateAdvance()
delete canvas;
}
+void tst_qquickspritesequence::test_jumpToCrash()
+{
+ QQuickView *canvas = new QQuickView(0);
+
+ canvas->setSource(testFileUrl("crashonstart.qml"));
+ canvas->show();
+ QTest::qWaitForWindowShown(canvas);
+ //verify: Don't crash
+
+ delete canvas;
+}
+
QTEST_MAIN(tst_qquickspritesequence)
#include "tst_qquickspritesequence.moc"