diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:32:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:32:02 +0200 |
| commit | 39288138deae44e045f3e1e7c676a13e4f6dd5c9 (patch) | |
| tree | dc160869c73a9e2cdc4746a0da474e9198a35668 /src | |
| parent | 7584cdd53ccd5ca3ae2ee84b012b5819a6e1820e (diff) | |
| parent | 67580ae6e2f75d93aae1e3412bf9c042b2992320 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I69ab6916dd8a67c0ed008bd3a7c69023757dcf93
Diffstat (limited to 'src')
| -rw-r--r-- | src/webview/qwebview_winrt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webview/qwebview_winrt.cpp b/src/webview/qwebview_winrt.cpp index 5895ec4..88b5ddf 100644 --- a/src/webview/qwebview_winrt.cpp +++ b/src/webview/qwebview_winrt.cpp @@ -121,7 +121,7 @@ public: ~HStringList() { - foreach (const HSTRING &hString, d) + for (const HSTRING &hString : qAsConst(d)) WindowsDeleteString(hString); } |