Commit 053b423c authored by pvuorela's avatar pvuorela

Merge branch 'omp-jb49478' into 'master'

[nemo-systemsettings] Change QVariant to QDBusVariant. Fixes JB#49478

See merge request mer-core/nemo-qml-plugin-systemsettings!139
parents 4dc39f24 ef3c00a3
......@@ -209,7 +209,7 @@ LocationSettingsPrivate::LocationSettingsPrivate(LocationSettings::Mode mode, Lo
this, SLOT(gpsTechPropertyChanged(QString,QVariant)));
this, SLOT(gpsTechPropertyChanged(QString, QDBusVariant)));
} else {
m_connMan = NetworkManagerFactory::createInstance();
connect(m_connMan, &NetworkManager::technologiesChanged,
......@@ -359,7 +359,7 @@ void LocationSettingsPrivate::updateOnlineAgpsState(const QString &name, Locatio
void LocationSettingsPrivate::gpsTechPropertyChanged(const QString &propertyName, const QVariant &)
void LocationSettingsPrivate::gpsTechPropertyChanged(const QString &propertyName, const QDBusVariant &)
if (propertyName == PoweredPropertyName) {
emit q->gpsFlightModeChanged();
......@@ -82,7 +82,7 @@ public:
private slots:
void readSettings();
void findGpsTech();
void gpsTechPropertyChanged(const QString &propertyName, const QVariant &value);
void gpsTechPropertyChanged(const QString &propertyName, const QDBusVariant &value);
// TODO: replace this with DBus calls to a central settings service...
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment