diff options
| author | Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> | 2020-01-22 14:00:37 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-27 12:41:47 +0100 |
| commit | 2aac6b3f26690b4d1be94be8f2b556794b022301 (patch) | |
| tree | f397c85d22342ec87f2e64b3707c39f19fbc0256 /tests/auto/declarative_core/tst_category.qml | |
| parent | 6423670fd00fb2b0918c41d9cbf8783912356619 (diff) | |
| download | qtlocation-2aac6b3f26690b4d1be94be8f2b556794b022301.tar.gz | |
Fix build with latest qtbase and qtdeclarative
* Bump the submodule to include the one build fix for sqlite3.
* Rename VisualDataModel to DelegateModel (it's been the latter for many
years and now the old name vanished)
* Fix dangling pointers into QList. In clearMapItems() we iterate over
m_mapItems and call removeMapItems(), which also removes from the same
QList (now vector). The same goes for m_mapItemGroups.
Change-Id: I4c229fd2cf1bce76d6ad5ffae4bdbda7fe8e6a18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/declarative_core/tst_category.qml')
| -rw-r--r-- | tests/auto/declarative_core/tst_category.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/declarative_core/tst_category.qml b/tests/auto/declarative_core/tst_category.qml index 51809dc3..f0a14d6f 100644 --- a/tests/auto/declarative_core/tst_category.qml +++ b/tests/auto/declarative_core/tst_category.qml @@ -27,6 +27,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQml.Models 2.14 import QtTest 1.0 import QtLocation 5.3 import "utils.js" as Utils @@ -100,7 +101,7 @@ TestCase { visibility: Place.DeviceVisibility } - VisualDataModel { + DelegateModel { id: categoryModel model: CategoryModel { |