diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-03 03:04:33 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-03 03:04:33 +0100 |
commit | 6847fe34373d9123c1ac35c9647567e5c2d46a5f (patch) | |
tree | d945cb66ba4f6e56e3810d35f70224ab735dc6dc /src/plugins/position | |
parent | 435f478a3e80d9ed17691c85e584d7fc6a71c3b7 (diff) | |
parent | 3aaa71792b6a30e12d1aaff66d7238770576b4cc (diff) | |
download | qtlocation-6847fe34373d9123c1ac35c9647567e5c2d46a5f.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iea2f0f612ee83e3d7bd1dfed47de296f4cc34038
Diffstat (limited to 'src/plugins/position')
-rw-r--r-- | src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp b/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp index bbc70f0a..414d2f34 100644 --- a/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp +++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp @@ -437,7 +437,7 @@ QList<QGeoAreaMonitorInfo> QGeoAreaMonitorPolling::activeMonitors(const QGeoShap QGeoAreaMonitorSource::AreaMonitorFeatures QGeoAreaMonitorPolling::supportedAreaMonitorFeatures() const { - return 0; + return {}; } void QGeoAreaMonitorPolling::connectNotify(const QMetaMethod &/*signal*/) |