diff options
27 files changed, 94 insertions, 48 deletions
diff --git a/.qmake.conf b/.qmake.conf index ad4261de..d53d4bb0 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,9 +1,9 @@ load(qt_build_config) CONFIG += warning_clean -DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST +DEFINES += QT_NO_JAVA_STYLE_ITERATORS -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..bc94f4e2 --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,16 @@ +dependencies: + ../qtbase: + ref: e0b89899e3c505edbdece60d6a2d2368a7ef9a01 + required: true + ../qtdeclarative: + ref: dbc6b9bfc7e6f1c7e212460105b426b8e80db671 + required: false + ../qtquickcontrols: + ref: e5658a34159ae32cff7a6c0e1295171c00fe923a + required: false + ../qtquickcontrols2: + ref: cc562c491ae6344d5956dbe4962b1dd09744551a + required: false + ../qtserialport: + ref: 0be470fd433e7514f3285ebdb1de776836048596 + 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 01b6fb62..d4606066 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -214,8 +214,9 @@ public: qmlRegisterUncreatableType<QDeclarativeGeoMapItemBase, 15>(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/locationvaluetypehelper.cpp b/src/location/declarativemaps/locationvaluetypehelper.cpp index 3e2f3658..e1ef7f59 100644 --- a/src/location/declarativemaps/locationvaluetypehelper.cpp +++ b/src/location/declarativemaps/locationvaluetypehelper.cpp @@ -164,7 +164,7 @@ QJSValue fromList(const QObject *object, const QList<QGeoCoordinate> &list) pathArray->put(i++, cv); } - return QJSValue(v4, pathArray.asReturnedValue()); + return QJSValuePrivate::fromReturnedValue(pathArray.asReturnedValue()); } QList<QGeoCoordinate> toList(const QObject *object, const QJSValue &value) diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index fc282829..17baf811 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -2059,20 +2059,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/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h index 8f5cb6ec..2a7ea6b1 100644 --- a/src/location/declarativemaps/qdeclarativegeomap_p.h +++ b/src/location/declarativemaps/qdeclarativegeomap_p.h @@ -63,6 +63,9 @@ #include <QtLocation/private/qgeomap_p.h> #include <QtQuick/private/qquickitemchangelistener_p.h> +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeomaptype_p.h>) +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeoserviceprovider_p.h>) + QT_BEGIN_NAMESPACE class QDeclarativeGeoServiceProvider; diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h index 0cf06d12..ca345743 100644 --- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h +++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h @@ -55,6 +55,9 @@ #include <QPointer> #include <QtQuick/QQuickPaintedItem> +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeomap_p.h>) + + QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/location/declarativemaps/qdeclarativegeoroute.cpp b/src/location/declarativemaps/qdeclarativegeoroute.cpp index c1f5264b..0144ade9 100644 --- a/src/location/declarativemaps/qdeclarativegeoroute.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroute.cpp @@ -192,7 +192,7 @@ QJSValue QDeclarativeGeoRoute::path() const pathArray->put(i, cv); } - return QJSValue(v4, pathArray.asReturnedValue()); + return QJSValuePrivate::fromReturnedValue(pathArray.asReturnedValue()); } void QDeclarativeGeoRoute::setPath(const QJSValue &value) diff --git a/src/location/declarativemaps/qdeclarativegeoroute_p.h b/src/location/declarativemaps/qdeclarativegeoroute_p.h index f455d027..9d89760a 100644 --- a/src/location/declarativemaps/qdeclarativegeoroute_p.h +++ b/src/location/declarativemaps/qdeclarativegeoroute_p.h @@ -55,6 +55,8 @@ #include <QtQml/QQmlListProperty> #include <QtLocation/QGeoRoute> +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeoroutemodel_p.h>) + QT_BEGIN_NAMESPACE class QDeclarativeGeoRouteQuery; diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp index 910e7026..a3a7fe85 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp @@ -959,7 +959,7 @@ QJSValue QDeclarativeGeoRouteQuery::excludedAreas() const excludedAreasArray->put(i, cv); } - return QJSValue(v4, excludedAreasArray.asReturnedValue()); + return QJSValuePrivate::fromReturnedValue(excludedAreasArray.asReturnedValue()); } void QDeclarativeGeoRouteQuery::setExcludedAreas(const QJSValue &value) diff --git a/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp b/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp index 6751a47b..713d434b 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp @@ -158,7 +158,7 @@ QJSValue QDeclarativeGeoRouteSegment::path() const pathArray->put(i, cv); } - return QJSValue(v4, pathArray.asReturnedValue()); + return QJSValuePrivate::fromReturnedValue(pathArray.asReturnedValue()); } QT_END_NAMESPACE diff --git a/src/location/declarativemaps/qdeclarativeroutemapitem_p.h b/src/location/declarativemaps/qdeclarativeroutemapitem_p.h index a0b171b0..f0759b66 100644 --- a/src/location/declarativemaps/qdeclarativeroutemapitem_p.h +++ b/src/location/declarativemaps/qdeclarativeroutemapitem_p.h @@ -55,6 +55,8 @@ #include <QPen> #include <QBrush> +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeoroute_p.h>) + QT_BEGIN_NAMESPACE class QDeclarativeGeoRoute; diff --git a/src/location/declarativeplaces/qdeclarativecategory_p.h b/src/location/declarativeplaces/qdeclarativecategory_p.h index c32072f4..96983c1f 100644 --- a/src/location/declarativeplaces/qdeclarativecategory_p.h +++ b/src/location/declarativeplaces/qdeclarativecategory_p.h @@ -57,6 +57,8 @@ #include <QtLocation/private/qdeclarativegeoserviceprovider_p.h> +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativeplaceicon_p.h>) + QT_BEGIN_NAMESPACE class QDeclarativePlaceIcon; diff --git a/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h b/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h index 05b559ae..53e24f42 100644 --- a/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h +++ b/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h @@ -54,6 +54,8 @@ #include <QtLocation/QPlaceContent> #include <QtLocation/QPlaceContentReply> +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativeplace_p.h>) + QT_BEGIN_NAMESPACE class QDeclarativePlace; diff --git a/src/location/doc/src/plugins/mapboxgl.qdoc b/src/location/doc/src/plugins/mapboxgl.qdoc index 119868d1..e3ca1a82 100644 --- a/src/location/doc/src/plugins/mapboxgl.qdoc +++ b/src/location/doc/src/plugins/mapboxgl.qdoc @@ -151,10 +151,10 @@ The following table lists optional parameters that can be passed to the Mapbox p \section2 Optional map parameters -The \l{QtLocation::Map}{Map} item using this plugin, can also be customized using \l{QtLocation::MapParameter}{MapParameters}, +The \l{QtLocation::Map}{Map} item using this plugin, can also be customized using \l{QtLocation::DynamicParameter}{DynamicParameters}, allowing runtime changes to the map style and data. -Examples of what can be currently controlled using \l{QtLocation::MapParameter}{MapParameter} are: +Examples of what can be currently controlled using \l{QtLocation::DynamicParameter}{DynamicParameter} are: \list \li Hide and show parts of the map, like roads and buildings. @@ -167,7 +167,7 @@ Examples of what can be currently controlled using \l{QtLocation::MapParameter}{ With the exception of extrusion and data driven style properties, every property described at the \l {https://www.mapbox.com/mapbox-gl-js/style-spec/}{Mapbox Style Specification} can be changed at runtime. -The \l{QtLocation::MapParameter}{MapParameters}, used to control the style of the map at runtime, always +The \l{QtLocation::DynamicParameter}{DynamicParameters}, used to control the style of the map at runtime, always have a \b type property, followed by user defined properties that try to match the \l {https://www.mapbox.com/mapbox-gl-js/style-spec/}{Mapbox Style Specification} naming as much as possible, replacing the dash with camel case for technical reasons (i.e. \b line-cap will be translated to \b lineCap). @@ -222,7 +222,7 @@ Map { center: QtPositioning.coordinate(60.170448, 24.942046) // Helsinki zoomLevel: 12 - MapParameter { + DynamicParameter { type: "source" property var name: "routeSource" @@ -233,7 +233,7 @@ Map { 60.16830257086771 ], [ 24.943315386772156, 60.16227776476442 ]]}}]}' } - MapParameter { + DynamicParameter { type: "layer" property var name: "route" @@ -245,7 +245,7 @@ Map { property var before: "road-label-small" } - MapParameter { + DynamicParameter { type: "paint" property var layer: "route" @@ -253,7 +253,7 @@ Map { property var lineWidth: 8.0 } - MapParameter { + DynamicParameter { type: "layout" property var layer: "route" diff --git a/src/location/labs/qdeclarativenavigator_p.h b/src/location/labs/qdeclarativenavigator_p.h index 24ff798f..30dd7f11 100644 --- a/src/location/labs/qdeclarativenavigator_p.h +++ b/src/location/labs/qdeclarativenavigator_p.h @@ -54,6 +54,13 @@ #include <QtLocation/private/qparameterizableobject_p.h> #include <QtLocation/qgeoserviceprovider.h> +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativenavigator_p_p.h>) +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeomap_p.h>) +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeoroute_p.h>) +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeoserviceprovider_p.h>) +Q_MOC_INCLUDE(<QtLocation/private/qnavigationmanagerengine_p.h>) +Q_MOC_INCLUDE(<QtPositioningQuick/private/qdeclarativepositionsource_p.h>) + QT_BEGIN_NAMESPACE class QDeclarativeGeoServiceProvider; diff --git a/src/location/labs/qmaprouteobject_p.h b/src/location/labs/qmaprouteobject_p.h index dcc35807..05354544 100644 --- a/src/location/labs/qmaprouteobject_p.h +++ b/src/location/labs/qmaprouteobject_p.h @@ -54,6 +54,8 @@ #include <QtLocation/private/qgeomapobject_p.h> #include <QtLocation/private/qparameterizableobject_p.h> +Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeoroute_p.h>) + QT_BEGIN_NAMESPACE class QDeclarativeGeoRoute; diff --git a/src/location/maps/qcache3q_p.h b/src/location/maps/qcache3q_p.h index 148c1f8b..53692d3a 100644 --- a/src/location/maps/qcache3q_p.h +++ b/src/location/maps/qcache3q_p.h @@ -47,7 +47,6 @@ // // We mean it. -#include <QtCore/qlinkedlist.h> #include <QtCore/qhash.h> #include <QtCore/qcache.h> #include <QtCore/qsharedpointer.h> diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro index b81ad34a..c67b5f5b 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -8,7 +8,8 @@ qtConfig(geoservices_esri): SUBDIRS += esri qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay qtConfig(geoservices_osm): SUBDIRS += osm -qtConfig(geoservices_mapboxgl) { +# for now turned off in Qt 6 +false:qtConfig(geoservices_mapboxgl) { !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) { warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") } else { 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 |