Fix segfault now that the signature of roleNames is changed.
authorStephen Kelly <stephen.kelly@kdab.com>
Thu, 12 Jan 2012 19:12:03 +0000 (20:12 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 25 Jan 2012 09:39:43 +0000 (10:39 +0100)
(QtBase c3ad8c1c062a972b7fb75d8b51a1f80cb371d503)

Change-Id: I037787f895f71b746c38557f6fdbfbba5813cb25
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp

index 6af9060..beb303e 100644 (file)
@@ -291,8 +291,9 @@ public:
                 for (int ii = 0; ii < m_roles.count(); ++ii)
                     m_roleNames.insert(m_listModelInterface->toString(m_roles.at(ii)).toUtf8(), m_roles.at(ii));
             } else if (m_abstractItemModel) {
-                for (QHash<int,QByteArray>::const_iterator it = m_abstractItemModel->roleNames().begin();
-                        it != m_abstractItemModel->roleNames().end(); ++it) {
+                QHash<int,QByteArray> roles = m_abstractItemModel->roleNames();
+                for (QHash<int,QByteArray>::const_iterator it = roles.begin();
+                        it != roles.end(); ++it) {
                     m_roles.append(it.key());
                     m_roleNames.insert(*it, it.key());
                 }