Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	.qmake.conf

Change-Id: I0724ca9ffbb8099f698b090a4fdd993fad2c2302

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/applications/positioning_backend/widget.cpp b/tests/applications/positioning_backend/widget.cpp
index ae39187d..efdaebdd 100644
--- a/tests/applications/positioning_backend/widget.cpp
+++ b/tests/applications/positioning_backend/widget.cpp
@@ -54,6 +54,15 @@ Widget::Widget(LogWidget *logWidget, QWidget *parent) :
 
     connect(m_posSource, SIGNAL(error(QGeoPositionInfoSource::Error)),
             this, SLOT(errorChanged(QGeoPositionInfoSource::Error)));
+    connect(m_posSource, &QGeoPositionInfoSource::supportedPositioningMethodsChanged,
+            this, [this]() {
+        auto methods = m_posSource->supportedPositioningMethods();
+        const QString status = QStringLiteral("Satellite: %1 ").arg(bool(methods & QGeoPositionInfoSource::SatellitePositioningMethods))
+                + QStringLiteral("Non-Satellite: %1").arg(bool(methods & QGeoPositionInfoSource::NonSatellitePositioningMethods));
+
+        qDebug() << "Available Positioning Methods Changed" << status;
+        log->appendLog(status);
+    });
 }
 
 void Widget::positionUpdated(QGeoPositionInfo gpsPos)