diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-04-07 16:23:35 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-04-10 11:48:32 +0000 |
commit | 314de829065a3fa411b8fed90ff1289b000e229b (patch) | |
tree | 1f075b1f5b17ee545c5a1cf4dab0b21176b0919f /src/networksettings/wpasupplicant | |
parent | c396ac229303aeafa06e741948f68b94c1671e1e (diff) |
Don't give connman user name as a network name
Don't give the network name as all, since it is not required for visible
networks. Also adjust the API to remove the user name parameter that was
never used (correctly).
Task-number: QTBUG-57249
Change-Id: I0eb75db6eebcaa05661a9404b728ab8af831cf1d
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/networksettings/wpasupplicant')
3 files changed, 4 insertions, 6 deletions
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp index 30f3f61..8721257 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp @@ -142,7 +142,7 @@ void QNetworkSettingsManagerPrivate::userInteractionReady(bool cancel) if (!service) { return; } - QString psk = m_agent->passPhrase(); + QString psk = m_agent->passphrase(); // --------------------- configure network ------------------------------ // ref: http://w1.fi/cgit/hostap/plain/wpa_supplicant/wpa_supplicant.conf diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp index b463606..4d49127 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp +++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp @@ -35,11 +35,10 @@ QNetworkSettingsUserAgentPrivate::QNetworkSettingsUserAgentPrivate(QNetworkSetti } -void QNetworkSettingsUserAgentPrivate::setUserCredentials(const QString& aUsername, const QString& aPassword) +void QNetworkSettingsUserAgentPrivate::setPassphrase(const QString &passphrase) { Q_Q(QNetworkSettingsUserAgent); - m_passphrase = aPassword; - m_username = aUsername; + m_passphrase = passphrase; emit q->ready(false); } diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h index 6b9fade..f2051c2 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h @@ -50,10 +50,9 @@ class QNetworkSettingsUserAgentPrivate : public QObject public: explicit QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent* parent); virtual ~QNetworkSettingsUserAgentPrivate() {} - void setUserCredentials(const QString& aUsername, const QString& aPassword); + void setPassphrase(const QString &passphrase); void cancel(); QString m_passphrase; - QString m_username; QNetworkSettingsUserAgent *q_ptr; }; |