From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Thu, 12 Jan 2012 19:12:03 +0000 (+0100)
Subject: Fix segfault now that the signature of roleNames is changed.
X-Git-Tag: qt-v5.0.0-alpha1~592
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=100f7ee211e27b8f8dd647ca76210293c7962adc;p=profile%2Fivi%2Fqtdeclarative.git

Fix segfault now that the signature of roleNames is changed.

(QtBase c3ad8c1c062a972b7fb75d8b51a1f80cb371d503)

Change-Id: I037787f895f71b746c38557f6fdbfbba5813cb25
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---

diff --git a/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp
index 6af9060..beb303e 100644
--- a/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -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());
                 }