diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:53:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:53:11 +0100 |
| commit | c5159ecfc36bc0f9bff45de78accd104b9637066 (patch) | |
| tree | f63ce3effc703e23fb3f5e9ae3880e5759dfe8b0 /src/imports/winextras/qquickjumplistcategory.cpp | |
| parent | 210b31fa48134ace767be47508b9918bcee9a22d (diff) | |
| parent | 1b8836e00da53872bd3c285e5ab5ac8344ccd46c (diff) | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
src/imports/winextras/qquickjumplist.cpp
Change-Id: I2272b873c872bbabf7e274a478e3d16b92cdb434
Diffstat (limited to 'src/imports/winextras/qquickjumplistcategory.cpp')
| -rw-r--r-- | src/imports/winextras/qquickjumplistcategory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/winextras/qquickjumplistcategory.cpp b/src/imports/winextras/qquickjumplistcategory.cpp index a69534f..052a4e6 100644 --- a/src/imports/winextras/qquickjumplistcategory.cpp +++ b/src/imports/winextras/qquickjumplistcategory.cpp @@ -127,7 +127,7 @@ void QQuickJumpListCategory::setVisible(bool visible) QList<QWinJumpListItem *> QQuickJumpListCategory::toItemList() const { QList<QWinJumpListItem *> items; - foreach (QQuickJumpListItem *item, m_items) + for (QQuickJumpListItem *item : m_items) items.append(item->toJumpListItem()); return items; } |