diff options
| author | Teemu Holappa <teemu.holappa@qt.io> | 2016-11-01 13:02:10 +0200 |
|---|---|---|
| committer | Teemu Holappa <teemu.holappa@qt.io> | 2016-11-17 08:13:10 +0000 |
| commit | 1652f4a05d65cf410701e38c4334fba9cf81eb95 (patch) | |
| tree | ad0aa0f21ff3392ff6575dd45c596813fd328eba /src/networksettings/qnetworksettings.h | |
| parent | e6475dfe5a4209ad6142c2400dec6b9fc4ef5f07 (diff) | |
Fix QNetworkSettingsManager usage from the C++
Fixed servicesChanged signal handling.
Fixed services and interfaces functions return types in QNetworkSettingsManager.
Task-number: QTBUG-56760
Change-Id: Iaade0d5c06e8ff8f8dea4b421e226ae6348a9fe5
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Diffstat (limited to 'src/networksettings/qnetworksettings.h')
| -rw-r--r-- | src/networksettings/qnetworksettings.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h index da75acd..5323f98 100644 --- a/src/networksettings/qnetworksettings.h +++ b/src/networksettings/qnetworksettings.h @@ -166,12 +166,11 @@ class Q_DECL_EXPORT QNetworkSettingsProxy : public QObject { Q_OBJECT Q_ENUMS(MethodType) -public: Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged) Q_PROPERTY(QAbstractItemModel* servers READ servers NOTIFY serversChanged) Q_PROPERTY(QAbstractItemModel* excludes READ excludes NOTIFY excludesChanged) Q_PROPERTY(MethodType method READ method WRITE setMethod NOTIFY methodChanged) - +public: explicit QNetworkSettingsProxy(QObject *parent = Q_NULLPTR); enum MethodType {Direct, Auto, Manual}; @@ -202,6 +201,7 @@ private: class Q_DECL_EXPORT QNetworkSettingsWireless : public QObject { Q_OBJECT + Q_ENUMS(SecurityFlags) Q_PROPERTY(int signalStrength READ signalStrength WRITE setSignalStrength NOTIFY signalStrengthChanged) Q_PROPERTY(bool hidden READ hidden NOTIFY hiddenChanged) Q_PROPERTY(bool isOutOfRange READ outOfRange WRITE setOutOfRange NOTIFY outOfRangeChanged) |