summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--dependencies.yaml16
-rw-r--r--examples/location/mapviewer/main.cpp4
-rw-r--r--examples/location/places/main.cpp4
m---------src/3rdparty/mapbox-gl-native0
-rw-r--r--src/imports/location/location.cpp5
-rw-r--r--src/imports/positioning/positioning.cpp5
-rw-r--r--src/location/declarativemaps/qdeclarativegeomap.cpp18
-rw-r--r--src/positioning/qdoublematrix4x4.cpp10
-rw-r--r--tests/auto/declarative_core/tst_category.qml3
-rw-r--r--tests/auto/declarative_core/tst_categorymodel.qml12
-rw-r--r--tests/auto/declarative_core/utils.js12
12 files changed, 57 insertions, 34 deletions
diff --git a/.qmake.conf b/.qmake.conf
index ad4261de..fd350632 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,7 +3,7 @@ CONFIG += warning_clean
DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-MODULE_VERSION = 5.15.0
+MODULE_VERSION = 6.0.0
# Adds a way to debug location. The define is needed for multiple subprojects as they
# include the essential headers.
diff --git a/dependencies.yaml b/dependencies.yaml
new file mode 100644
index 00000000..8715b2f6
--- /dev/null
+++ b/dependencies.yaml
@@ -0,0 +1,16 @@
+dependencies:
+ ../qtbase:
+ ref: 06bb315beb6c2c398223cfe52cbc7f66e14a8557
+ required: true
+ ../qtdeclarative:
+ ref: be7e33e5dd59c0b8c077cdcb7849af3907455afc
+ required: false
+ ../qtquickcontrols:
+ ref: 2a8e875910728653cb8dd1c61578d2e76bd26d03
+ required: false
+ ../qtquickcontrols2:
+ ref: d9fd55a9d431be07bd6946afe8855b19c06bde97
+ required: false
+ ../qtserialport:
+ ref: 3ffa5b013c8b94a50b4695a36077f0c83c43e3d3
+ required: false
diff --git a/examples/location/mapviewer/main.cpp b/examples/location/mapviewer/main.cpp
index b332de8c..ec54b5a2 100644
--- a/examples/location/mapviewer/main.cpp
+++ b/examples/location/mapviewer/main.cpp
@@ -66,8 +66,8 @@ static bool parseArgs(QStringList& args, QVariantMap& parameters)
if (param.startsWith("--help")) {
QTextStream out(stdout);
- out << "Usage: " << endl;
- out << "--plugin.<parameter_name> <parameter_value> - Sets parameter = value for plugin" << endl;
+ out << "Usage: " << Qt::endl;
+ out << "--plugin.<parameter_name> <parameter_value> - Sets parameter = value for plugin" << Qt::endl;
out.flush();
return true;
}
diff --git a/examples/location/places/main.cpp b/examples/location/places/main.cpp
index c677e429..69d31ae8 100644
--- a/examples/location/places/main.cpp
+++ b/examples/location/places/main.cpp
@@ -63,8 +63,8 @@ static bool parseArgs(QStringList& args, QVariantMap& parameters)
if (param.startsWith("--help")) {
QTextStream out(stdout);
- out << "Usage: " << endl;
- out << "--plugin.<parameter_name> <parameter_value> - Sets parameter = value for plugin" << endl;
+ out << "Usage: " << Qt::endl;
+ out << "--plugin.<parameter_name> <parameter_value> - Sets parameter = value for plugin" << Qt::endl;
out.flush();
return true;
}
diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native
-Subproject d9577fdebe019b19e184b4cac82749ae9ec87af
+Subproject 8af62305d2e0208357c98e61bc2a9c9de8fe611
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index fd53ad7a..917ad25a 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -206,8 +206,9 @@ public:
qmlRegisterUncreatableType<QDeclarativeGeoMapItemBase, 14>(uri, major, minor, "GeoMapItemBase",
QStringLiteral("GeoMapItemBase is not intended instantiable by developer."));
- // Register the latest Qt version as QML type version
- qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
+ // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+ // Qt 5 release.
+ qmlRegisterModule(uri, 5, 15);
//registrations below are version independent
qRegisterMetaType<QPlaceCategory>();
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 38b9378a..27098a85 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -619,8 +619,9 @@ public:
minor = 14;
qmlRegisterType<QDeclarativePluginParameter >(uri, major, minor, "PluginParameter");
- // Register the latest Qt version as QML type version
- qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
+ // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+ // Qt 5 release.
+ qmlRegisterModule(uri, 5, 15);
} else {
qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);
}
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index 6a2d82e8..167f1d5f 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
@@ -2058,20 +2058,24 @@ void QDeclarativeGeoMap::clearMapItems()
return;
int removed = 0;
- for (auto i : qAsConst(m_mapItemGroups)) {
+ for (int i = 0; i < m_mapItemGroups.count(); ++i) {
+ auto item = m_mapItemGroups.at(i);
// Processing only top-level groups (!views)
- QDeclarativeGeoMapItemView *view = qobject_cast<QDeclarativeGeoMapItemView *>(i);
- if (view)
+ if (qobject_cast<QDeclarativeGeoMapItemView *>(item))
continue;
- if (i->parentItem() != this)
+
+ if (item->parentItem() != this)
continue;
- removed += removeMapItemGroup_real(i);
+ if (removeMapItemGroup_real(item)) {
+ removed++;
+ --i;
+ }
}
- for (auto i : qAsConst(m_mapItems))
- removed += removeMapItem_real(i);
+ while (!m_mapItems.isEmpty())
+ removed += removeMapItem_real(m_mapItems.first());
if (removed)
emit mapItemsChanged();
diff --git a/src/positioning/qdoublematrix4x4.cpp b/src/positioning/qdoublematrix4x4.cpp
index 32cc7f1f..0bc56460 100644
--- a/src/positioning/qdoublematrix4x4.cpp
+++ b/src/positioning/qdoublematrix4x4.cpp
@@ -1072,12 +1072,12 @@ QDebug operator<<(QDebug dbg, const QDoubleMatrix4x4 &m)
}
// Output in row-major order because it is more human-readable.
- dbg.nospace() << "QDoubleMatrix4x4(type:" << bits.constData() << endl
+ dbg.nospace() << "QDoubleMatrix4x4(type:" << bits.constData() << Qt::endl
<< qSetFieldWidth(10)
- << m(0, 0) << m(0, 1) << m(0, 2) << m(0, 3) << endl
- << m(1, 0) << m(1, 1) << m(1, 2) << m(1, 3) << endl
- << m(2, 0) << m(2, 1) << m(2, 2) << m(2, 3) << endl
- << m(3, 0) << m(3, 1) << m(3, 2) << m(3, 3) << endl
+ << m(0, 0) << m(0, 1) << m(0, 2) << m(0, 3) << Qt::endl
+ << m(1, 0) << m(1, 1) << m(1, 2) << m(1, 3) << Qt::endl
+ << m(2, 0) << m(2, 1) << m(2, 2) << m(2, 3) << Qt::endl
+ << m(3, 0) << m(3, 1) << m(3, 2) << m(3, 3) << Qt::endl
<< qSetFieldWidth(0) << ')';
return dbg;
}
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 {
diff --git a/tests/auto/declarative_core/tst_categorymodel.qml b/tests/auto/declarative_core/tst_categorymodel.qml
index 86d0fd4c..59ec3e7c 100644
--- a/tests/auto/declarative_core/tst_categorymodel.qml
+++ b/tests/auto/declarative_core/tst_categorymodel.qml
@@ -74,9 +74,9 @@ TestCase {
function test_hierarchicalModel() {
var modelSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy");
- var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3;'
- + 'VisualDataModel { model: CategoryModel {} delegate: Item {} }',
- testCase, "VisualDataModel");
+ var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtQml.Models 2.14; import QtLocation 5.3;'
+ + 'DelegateModel { model: CategoryModel {} delegate: Item {} }',
+ testCase, "DelegateModel");
modelSpy.target = categoryModel.model;
modelSpy.signalName = "statusChanged";
@@ -147,9 +147,9 @@ TestCase {
function test_flatModel() {
var modelSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy");
- var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3;'
- + 'VisualDataModel { model: CategoryModel {} delegate: Item {} }',
- testCase, "VisualDataModel");
+ var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtQml.Models 2.14; import QtLocation 5.3;'
+ + 'DelegateModel { model: CategoryModel {} delegate: Item {} }',
+ testCase, "DelegateModel");
modelSpy.target = categoryModel.model;
modelSpy.signalName = "statusChanged";
diff --git a/tests/auto/declarative_core/utils.js b/tests/auto/declarative_core/utils.js
index 5370bab5..2b7dca32 100644
--- a/tests/auto/declarative_core/utils.js
+++ b/tests/auto/declarative_core/utils.js
@@ -97,8 +97,8 @@ function testConsecutiveFetch(testCase, model, place, expectedValues, data)
signalSpy.target = model;
signalSpy.signalName ="totalCountChanged";
- var visDataModel = Qt.createQmlObject('import QtQuick 2.0; '
- + 'VisualDataModel{ delegate: Text{} }',
+ var visDataModel = Qt.createQmlObject('import QtQuick 2.0; import QtQml.Models 2.14; '
+ + 'DelegateModel{ delegate: Text{} }',
testCase, "dataModel");
visDataModel.model = model;
@@ -140,8 +140,8 @@ function testConsecutiveFetch(testCase, model, place, expectedValues, data)
function testReset(testCase, model, place)
{
- var dataModel = Qt.createQmlObject('import QtQuick 2.0; '
- + 'VisualDataModel{ delegate: Text{} }',
+ var dataModel = Qt.createQmlObject('import QtQuick 2.0; import QtQml.Models 2.14; '
+ + 'DelegateModel{ delegate: Text{} }',
testCase, "dataModel");
dataModel.model = model;
@@ -160,8 +160,8 @@ function testReset(testCase, model, place)
function testFetch(testCase, data)
{
var model = data.model;
- var visDataModel = Qt.createQmlObject('import QtQuick 2.0; '
- + 'VisualDataModel{ delegate: Text{} }',
+ var visDataModel = Qt.createQmlObject('import QtQuick 2.0; import QtQml.Models 2.14; '
+ + 'DelegateModel{ delegate: Text{} }',
testCase, "dataModel");
visDataModel.model = model
View Lorry Controller Status