From 51665a9ecaebaef2382c1e76ebedfeffacb4b3de Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 25 Apr 2013 18:10:01 +0200 Subject: [PATCH] QQmlVMEGuard is not ok if one of the context engines is gone Task-number: QTBUG-30632 Change-Id: Idff323f5b29688477e31030111d4f49f644115cd Reviewed-by: Alan Alpert --- src/qml/qml/qqmlvme.cpp | 2 +- .../listview/data/asyncloadercurrentindex.qml | 64 ++++++++++++++++++++++ tests/auto/qmltest/listview/tst_listview.qml | 39 +++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 tests/auto/qmltest/listview/data/asyncloadercurrentindex.qml diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index ad76b70..8c2902a 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -1469,7 +1469,7 @@ bool QQmlVMEGuard::isOK() const return false; for (int ii = 0; ii < m_contextCount; ++ii) - if (m_contexts[ii].isNull()) + if (m_contexts[ii].isNull() || !m_contexts[ii]->engine) return false; return true; diff --git a/tests/auto/qmltest/listview/data/asyncloadercurrentindex.qml b/tests/auto/qmltest/listview/data/asyncloadercurrentindex.qml new file mode 100644 index 0000000..a721f85 --- /dev/null +++ b/tests/auto/qmltest/listview/data/asyncloadercurrentindex.qml @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Rectangle { + color: "black" + + Rectangle { + color: "red" + + height: 150 + width: 150 + + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } + + NumberAnimation on rotation { + from: 0 + to: 360 + duration: 5000 + loops: Animation.Infinite + } + } +} diff --git a/tests/auto/qmltest/listview/tst_listview.qml b/tests/auto/qmltest/listview/tst_listview.qml index 52384fe..78e2e6d 100644 --- a/tests/auto/qmltest/listview/tst_listview.qml +++ b/tests/auto/qmltest/listview/tst_listview.qml @@ -67,11 +67,38 @@ Item { delegate: Text { text: model.name } } + ListView { + id: asyncLoaderCurrentIndexListView + width: 360 + height: 360 + model: asyncLoaderCurrentIndexListModel + + currentIndex: 0 + + delegate: Loader { + width: asyncLoaderCurrentIndexListView.width + height: asyncLoaderCurrentIndexListView.height + + source: component + asynchronous: true + } + } + ListModel { id: emptymodel } ListModel { id: manyitems } ListModel { id: firstmodel; ListElement { name: "FirstModelElement0" } } ListModel { id: secondmodel; ListElement { name: "SecondModelElement0" } ListElement { name: "SecondModelElement1" } } ListModel { id: altermodel; ListElement { name: "AlterModelElement0" } ListElement { name: "AlterModelElement1" } } + ListModel { + id: asyncLoaderCurrentIndexListModel + ListElement { component: "data/asyncloadercurrentindex.qml" } + ListElement { component: "data/asyncloadercurrentindex.qml" } + ListElement { component: "data/asyncloadercurrentindex.qml" } + ListElement { component: "data/asyncloadercurrentindex.qml" } + ListElement { component: "data/asyncloadercurrentindex.qml" } + ListElement { component: "data/asyncloadercurrentindex.qml" } + } + TestCase { name: "ListView" @@ -172,5 +199,17 @@ Item { tryCompare(modelalter.count, 0) compare(modelalter.currentItem, null) } + + function test_asyncLoaderCurrentIndexChange() { + for (var i = 0; i < 500; i++) { + asyncLoaderCurrentIndexListView.currentIndex = 0; + asyncLoaderCurrentIndexListView.currentIndex = 1; + asyncLoaderCurrentIndexListView.currentIndex = 2; + asyncLoaderCurrentIndexListView.currentIndex = 3; + asyncLoaderCurrentIndexListView.currentIndex = 4; + asyncLoaderCurrentIndexListView.currentIndex = 5; + } + wait(1000) + } } } -- 2.7.4