From 8a08b56e71ff3d842cbfb6460a18d5ff991689db Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 30 Jul 2019 11:25:43 +0300 Subject: Add changes file for Qt 5.13.1 + 0e64148b39ab7e7417d9d115ddc53631167989b1 Android: disable tests requiring plugins or local files + 190909eb1e537f9840b38eff47713281edc8a204 Compile fix + 90defc33dceb341aa8dac03c0511b1ef2a20c6c2 Doc: Fix documentation issues + 1459f4474282c8804adf01f4faba70944771c5d7 Bump version + 24273e2249082a904b326c16a1913bcef3a37367 Fix crash when removing items from MapboxGL maps + 2e02797471e55684a71979f330a4f507e86e5bcc Add changes file for Qt 5.12.4 + 7df7bc13f1b483504b01685888d3e3b6b6224a87 winrt: Do not assert if requesting access failed + 06290ec441d9a031797fa91e499a1070f25715e7 Bump version + 63cd689a400ee57f7e898e81290366c266537982 Bump version + eebb7ba6e0bd00956e0e8348f66d00ce9f90a8c9 Doc: Replace example file lists with links to code.qt.io Change-Id: If794d92ee0d714afff072bc5735bed169c03d9da Reviewed-by: Paolo Angelelli Reviewed-by: Alex Blasche --- dist/changes-5.13.1 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dist/changes-5.13.1 diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1 new file mode 100644 index 00000000..57ebdbeb --- /dev/null +++ b/dist/changes-5.13.1 @@ -0,0 +1,20 @@ +Qt 5.13.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. -- cgit v1.2.3 From 1de7ca6175bd3e4a542a038a089cfd73c9eaa27a Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 20 Aug 2019 13:16:26 +0300 Subject: Add changes file for Qt 5.12.5 + 7df7bc13f1b483504b01685888d3e3b6b6224a87 winrt: Do not assert if requesting access failed + 63cd689a400ee57f7e898e81290366c266537982 Bump version Change-Id: I18855bfcc953f30aab48b283f75b11894883b76d Reviewed-by: Paolo Angelelli Reviewed-by: Jani Heikkinen --- dist/changes-5.12.5 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dist/changes-5.12.5 diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5 new file mode 100644 index 00000000..e8be9316 --- /dev/null +++ b/dist/changes-5.12.5 @@ -0,0 +1,20 @@ +Qt 5.12.5 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.4. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. -- cgit v1.2.3 From 08972f5e65c8d7286fe1435cb85be4574ac3772f Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Wed, 4 Sep 2019 11:36:58 +0200 Subject: Update SHA of mapbox-gl-native to the upsteram version Bumps Mapbox GL to a new version that fixes the Qt version comparison. Change-Id: Ia6df7a461fc2358cda7e3ac7aa0d58c2b5b8fcfb Reviewed-by: Paolo Angelelli --- src/3rdparty/mapbox-gl-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native index 4b85252f..5233c75b 160000 --- a/src/3rdparty/mapbox-gl-native +++ b/src/3rdparty/mapbox-gl-native @@ -1 +1 @@ -Subproject commit 4b85252fbe811a786c6ee9eabedb7639b031dc53 +Subproject commit 5233c75b3f6c73623c5473b2d6573f31f3ddb4b7 -- cgit v1.2.3 From 97ec41652f6eadb341eab8f7936cf7f8b5252677 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Tue, 27 Aug 2019 13:37:39 +0200 Subject: Fix 5.14 positioning APIs This patch fixes a few inconsistencies in the newely added features. Change-Id: Icdf1c9208fd0d5ab1d6ec6d87fcc5be5072c3f58 Fixes: QTBUG-77865 Reviewed-by: Alex Blasche --- src/positioning/qgeopositioninfosource.cpp | 4 +-- src/positioning/qgeopositioninfosource.h | 4 +-- src/positioning/qgeopositioninfosource_p.h | 2 +- src/positioning/qgeopositioninfosourcefactory.cpp | 39 ++++++++++++++++++++++ src/positioning/qgeosatelliteinfosource.h | 2 +- .../qdeclarativepositionsource.cpp | 2 +- .../qdeclarativepositionsource_p.h | 2 +- tests/auto/positionplugin/plugin.cpp | 2 +- 8 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp index 69fcdef0..4690f8a3 100644 --- a/src/positioning/qgeopositioninfosource.cpp +++ b/src/positioning/qgeopositioninfosource.cpp @@ -133,7 +133,7 @@ void QGeoPositionInfoSourcePrivate::loadPlugin() factory = factoryV2; } -bool QGeoPositionInfoSourcePrivate::setBackendProperty(const QString &/*name*/, QVariant /*value*/) +bool QGeoPositionInfoSourcePrivate::setBackendProperty(const QString &/*name*/, const QVariant & /*value*/) { return false; } @@ -241,7 +241,7 @@ QString QGeoPositionInfoSource::sourceName() const \sa backendProperty \since Qt 5.14 */ -bool QGeoPositionInfoSource::setBackendProperty(const QString &name, QVariant value) +bool QGeoPositionInfoSource::setBackendProperty(const QString &name, const QVariant &value) { return d->setBackendProperty(name, value); } diff --git a/src/positioning/qgeopositioninfosource.h b/src/positioning/qgeopositioninfosource.h index eaf5e106..15465bdf 100644 --- a/src/positioning/qgeopositioninfosource.h +++ b/src/positioning/qgeopositioninfosource.h @@ -87,7 +87,7 @@ public: QString sourceName() const; - bool setBackendProperty(const QString &name, QVariant value); + bool setBackendProperty(const QString &name, const QVariant &value); QVariant backendProperty(const QString &name) const; static QGeoPositionInfoSource *createDefaultSource(QObject *parent); @@ -110,7 +110,7 @@ Q_SIGNALS: void supportedPositioningMethodsChanged(); protected: - QGeoPositionInfoSource(QGeoPositionInfoSourcePrivate &dd, QObject *parent); + explicit QGeoPositionInfoSource(QGeoPositionInfoSourcePrivate &dd, QObject *parent); private: Q_DISABLE_COPY(QGeoPositionInfoSource) diff --git a/src/positioning/qgeopositioninfosource_p.h b/src/positioning/qgeopositioninfosource_p.h index ccd92a4e..2ae93055 100644 --- a/src/positioning/qgeopositioninfosource_p.h +++ b/src/positioning/qgeopositioninfosource_p.h @@ -76,7 +76,7 @@ public: void loadMeta(); void loadPlugin(); - virtual bool setBackendProperty(const QString &name, QVariant value); + virtual bool setBackendProperty(const QString &name, const QVariant &value); virtual QVariant backendProperty(const QString &name) const; static QHash plugins(bool reload = false); diff --git a/src/positioning/qgeopositioninfosourcefactory.cpp b/src/positioning/qgeopositioninfosourcefactory.cpp index 76803566..afb0a1d3 100644 --- a/src/positioning/qgeopositioninfosourcefactory.cpp +++ b/src/positioning/qgeopositioninfosourcefactory.cpp @@ -84,6 +84,45 @@ QT_BEGIN_NAMESPACE QGeoPositionInfoSourceFactory::~QGeoPositionInfoSourceFactory() {} +/*! + \class QGeoPositionInfoSourceFactoryV2 + \inmodule QtPositioning + \since 5.14 + + \brief The QGeoPositionInfoSourceFactoryV2 class extends + QGeoPositionInfoSourceFactory, adding factory methods taking a parameters argument. + + This interface has the priority over the older one with plugins implementing it, + when creating a positioning source (position, satellite or area monitor) +*/ + +/*! + \fn QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryV2::positionInfoSourceWithParameters(QObject *parent, const QVariantMap ¶meters) + + Returns a new QGeoPositionInfoSource associated with this plugin + with parent \a parent, and using \a parameters as configuration parameters. + Can also return 0, in which case the plugin loader will use the factory with + the next highest priority. + */ + +/*! + \fn QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryV2::satelliteInfoSourceWithParameters(QObject *parent, const QVariantMap ¶meters) + + Returns a new QGeoSatelliteInfoSource associated with this plugin + with parent \a parent., and using \a parameters as configuration parameters. + Can also return 0, in which case the plugin loader will use the factory with + the next highest priority. + */ + +/*! + \fn QGeoAreaMonitorSource *QGeoPositionInfoSourceFactoryV2::areaMonitorWithParameters(QObject *parent, const QVariantMap ¶meters); + + Returns a new QGeoAreaMonitorSource associated with this plugin with parent + \a parent, and using \a parameters as configuration parameters. + Can also return 0, in which case the plugin loader will use the factory with + the next highest priority. + */ + QGeoPositionInfoSourceFactoryV2::~QGeoPositionInfoSourceFactoryV2() {} diff --git a/src/positioning/qgeosatelliteinfosource.h b/src/positioning/qgeosatelliteinfosource.h index 4f073864..e9c4fa19 100644 --- a/src/positioning/qgeosatelliteinfosource.h +++ b/src/positioning/qgeosatelliteinfosource.h @@ -91,7 +91,7 @@ Q_SIGNALS: void error(QGeoSatelliteInfoSource::Error); protected: - QGeoSatelliteInfoSource(QGeoSatelliteInfoSourcePrivate &dd, QObject *parent); + explicit QGeoSatelliteInfoSource(QGeoSatelliteInfoSourcePrivate &dd, QObject *parent); private: Q_DISABLE_COPY(QGeoSatelliteInfoSource) diff --git a/src/positioningquick/qdeclarativepositionsource.cpp b/src/positioningquick/qdeclarativepositionsource.cpp index cfbcc9da..6e042d9f 100644 --- a/src/positioningquick/qdeclarativepositionsource.cpp +++ b/src/positioningquick/qdeclarativepositionsource.cpp @@ -873,7 +873,7 @@ void QDeclarativePositionSource::componentComplete() \sa backendProperty, QGeoPositionInfoSource::setBackendProperty */ -bool QDeclarativePositionSource::setBackendProperty(const QString &name, QVariant value) +bool QDeclarativePositionSource::setBackendProperty(const QString &name, const QVariant &value) { if (m_positionSource) return m_positionSource->setBackendProperty(name, value); diff --git a/src/positioningquick/qdeclarativepositionsource_p.h b/src/positioningquick/qdeclarativepositionsource_p.h index dff0006c..da6f8305 100644 --- a/src/positioningquick/qdeclarativepositionsource_p.h +++ b/src/positioningquick/qdeclarativepositionsource_p.h @@ -131,7 +131,7 @@ public: void classBegin() { } void componentComplete(); - Q_INVOKABLE bool setBackendProperty(const QString &name, QVariant value); + Q_INVOKABLE bool setBackendProperty(const QString &name, const QVariant &value); Q_INVOKABLE QVariant backendProperty(const QString &name) const; public Q_SLOTS: diff --git a/tests/auto/positionplugin/plugin.cpp b/tests/auto/positionplugin/plugin.cpp index 9d5c7dd5..f28797b5 100644 --- a/tests/auto/positionplugin/plugin.cpp +++ b/tests/auto/positionplugin/plugin.cpp @@ -69,7 +69,7 @@ private slots: class DummySourcePrivate : public QGeoPositionInfoSourcePrivate { public: - bool setBackendProperty(const QString &name, QVariant value) override + bool setBackendProperty(const QString &name, const QVariant &value) override { if (name == QStringLiteral("altitude")) { m_altitude = value.toReal(); -- cgit v1.2.3 From 0cb5a2f498b38331c6c3bdd5d53777acadd5feea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= Date: Fri, 20 Sep 2019 16:04:32 +0200 Subject: Ensure that geotestplugin is built before the targets that depends on it Change-Id: Ib3a9ea37506e29eafcfb45e0c1d73a4c65d8e70b Fixes: QTBUG-78562 Reviewed-by: Paolo Angelelli --- tests/auto/auto.pro | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 05559d12..2b04d110 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -2,6 +2,8 @@ TEMPLATE = subdirs qtHaveModule(location) { + SUBDIRS += geotestplugin # several subtargets depend on this + #Place unit tests SUBDIRS += qplace \ qplaceattribute \ @@ -25,19 +27,22 @@ qtHaveModule(location) { qplacesearchsuggestionreply \ qplaceuser - !android: SUBDIRS += \ + !android: { + SUBDIRS += \ qplacemanager \ qplacemanager_nokia \ qplacemanager_unsupported \ placesplugin_unsupported + qplacemanager.depends = geotestplugin + } + #misc tests SUBDIRS += doublevectors !android: SUBDIRS += cmake qmlinterface # looks for .qmls locally #Map and Navigation tests - SUBDIRS += geotestplugin \ - qgeocodingmanagerplugins \ + SUBDIRS += qgeocodingmanagerplugins \ qgeocameracapabilities\ qgeocameradata \ qgeocodereply \ @@ -54,17 +59,25 @@ qtHaveModule(location) { qgeocameratiles # These use plugins - !android: SUBDIRS += qgeoserviceprovider \ + !android: { + SUBDIRS += qgeoserviceprovider \ qgeoroutingmanager \ nokia_services \ qgeocodingmanager \ qgeotiledmap + qgeoserviceprovider.depends = geotestplugin + qgeotiledmap.depends = geotestplugin + } qtHaveModule(quick):!android { SUBDIRS += declarative_geoshape \ declarative_core + declarative_core.depends = geotestplugin - !mac: SUBDIRS += declarative_ui + !mac: { + SUBDIRS += declarative_ui + declarative_ui.depends = geotestplugin + } } } -- cgit v1.2.3