diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-03 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-03 01:00:10 +0200 |
| commit | 441ac7084cb17cc7f6bb07bdfc7cad3615eed9e2 (patch) | |
| tree | 02957952f07a580fddebb025584b6aeaaf778d60 /src/network | |
| parent | ae868dfbdc7235fef9aeeac015f448d129d5f358 (diff) | |
| parent | e646ab2ab5491659f7aa028485b7502a06d4788d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I8303ca41d0ca9ce1fdb27259db4f9f8448c74bcb
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkproxy_win.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index e67faaf856..db51732bd3 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -370,7 +370,10 @@ static QList<QNetworkProxy> parseServerList(const QNetworkProxyQuery &query, con #if !defined(Q_OS_WINRT) namespace { class QRegistryWatcher { + Q_DISABLE_COPY(QRegistryWatcher) public: + QRegistryWatcher() = default; + void addLocation(HKEY hive, const QString& path) { HKEY openedKey; @@ -422,6 +425,7 @@ private: class QWindowsSystemProxy { + Q_DISABLE_COPY(QWindowsSystemProxy) public: QWindowsSystemProxy(); ~QWindowsSystemProxy(); |