diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-09-29 17:50:28 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-09-29 17:51:20 +0900 |
| commit | be53652eb30edd6e096c172a97609070d1e74746 (patch) | |
| tree | 43c50381ad2bc851fd1351bb321ed5d1b8e170d1 /lib/networksettings.cpp | |
| parent | 8f1bfa5c5764e399259c13b260661647363cf5d9 (diff) | |
| download | libquotient-be53652eb30edd6e096c172a97609070d1e74746.tar.gz libquotient-be53652eb30edd6e096c172a97609070d1e74746.zip | |
Settings: childGroups() should merge legacy and current groups; QMC->QTNT in macros
Because otherwise migrating one group to the current location leads to all other groups suddenly disappearing from Settings view.
Diffstat (limited to 'lib/networksettings.cpp')
| -rw-r--r-- | lib/networksettings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/networksettings.cpp b/lib/networksettings.cpp index cb071483..40ecba11 100644 --- a/lib/networksettings.cpp +++ b/lib/networksettings.cpp @@ -26,9 +26,9 @@ void NetworkSettings::setupApplicationProxy() const { proxyType(), proxyHostName(), proxyPort() }); } -QMC_DEFINE_SETTING(NetworkSettings, QNetworkProxy::ProxyType, proxyType, +QTNT_DEFINE_SETTING(NetworkSettings, QNetworkProxy::ProxyType, proxyType, "proxy_type", QNetworkProxy::DefaultProxy, setProxyType) -QMC_DEFINE_SETTING(NetworkSettings, QString, proxyHostName, "proxy_hostname", +QTNT_DEFINE_SETTING(NetworkSettings, QString, proxyHostName, "proxy_hostname", {}, setProxyHostName) -QMC_DEFINE_SETTING(NetworkSettings, quint16, proxyPort, "proxy_port", -1, +QTNT_DEFINE_SETTING(NetworkSettings, quint16, proxyPort, "proxy_port", -1, setProxyPort) |