Fix conflict with other branch
This commit is contained in:
parent
f38c47d039
commit
8418de15a4
@ -164,10 +164,7 @@ NetworkManager::NetworkManagerError NetworkManager::connectWifi(const QString &i
|
|||||||
// Note: disable power save mode
|
// Note: disable power save mode
|
||||||
wirelessSettings.insert("powersave", 2);
|
wirelessSettings.insert("powersave", 2);
|
||||||
|
|
||||||
if (hidden) {
|
if (hidden) wirelessSettings.insert("hidden", true);
|
||||||
|
|
||||||
wirelessSettings.insert("hidden", true);
|
|
||||||
}
|
|
||||||
|
|
||||||
QVariantMap wirelessSecuritySettings;
|
QVariantMap wirelessSecuritySettings;
|
||||||
wirelessSecuritySettings.insert("auth-alg", "open");
|
wirelessSecuritySettings.insert("auth-alg", "open");
|
||||||
|
|||||||
Reference in New Issue
Block a user