diff options
| author | Dawit Alemayehu <[email protected]> | 2013-06-20 08:41:12 -0400 |
|---|---|---|
| committer | Dawit Alemayehu <[email protected]> | 2013-06-20 08:41:12 -0400 |
| commit | fda88516e9c32ed93cb4fe47a3a9a9bf2aecc456 (patch) | |
| tree | a1bf218a4724db94cd9f4c8660d9fd421441759d /src/kitemviews/kfileitemmodel.cpp | |
| parent | 030acf4f1188e392a43b6cd398628085470e4cfe (diff) | |
| parent | 75ed1946f8743bc924d28a49ca87df1392f1d408 (diff) | |
Merge remote-tracking branch 'origin/KDE/4.10'
Diffstat (limited to 'src/kitemviews/kfileitemmodel.cpp')
| -rw-r--r-- | src/kitemviews/kfileitemmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 5079b2fe2..4b7e5eb19 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -644,11 +644,11 @@ void KFileItemModel::onSortRoleChanged(const QByteArray& current, const QByteArr Q_UNUSED(previous); m_sortRole = typeForRole(current); -#ifdef KFILEITEMMODEL_DEBUG if (!m_requestRole[m_sortRole]) { - kWarning() << "The sort-role has been changed to a role that has not been received yet"; + QSet<QByteArray> newRoles = m_roles; + newRoles << current; + setRoles(newRoles); } -#endif resortAllItems(); } |