Merge lp:~osomon/ubuntu-ui-toolkit/staging-fix-1495641 into lp:ubuntu-ui-toolkit/staging

[Olivier Tilloy]

Take custom key indexes into account in QSortFilterProxyModelQML::get().

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1634
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/949
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/951
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/951/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/948

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2221/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Fair point! Taken.

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/sortfiltermodel.cpp'
--- src/Ubuntu/Components/plugin/sortfiltermodel.cpp	2015-08-20 17:08:49 +0000
+++ src/Ubuntu/Components/plugin/sortfiltermodel.cpp	2015-09-14 17:35:12 +0000
@@ -220,8 +220,11 @@
 {
     QVariantMap res;
     const QHash<int, QByteArray> roles = roleNames();
-    for(int role = 0; role < roles.count(); role++)
-        res.insert (roles[role], data(row, role));
+    QHashIterator<int, QByteArray> i(roles);
+    while (i.hasNext()) {
+        i.next();
+        res.insert(i.value(), data(row, i.key()));
+    }
     return res;
 }