2 files changed, 8 insertions, 5 deletions
diff --git a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp
index b88f4923..ddf20309 100644
--- a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp
+++ b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp
@@ -56,11 +56,6 @@ QDeclarativeLocationTestModel::QDeclarativeLocationTestModel(QObject *parent):
     qsrand(QTime(0,0,0).secsTo(QTime::currentTime()) + QCoreApplication::applicationPid());
     timer_.setSingleShot(true);
     connect(&timer_, SIGNAL(timeout()), this, SLOT(timerFired()));
-    // Establish role names so that they can be queried from this model
-    QHash<int, QByteArray> roleNames;
-    roleNames = QAbstractItemModel::roleNames();
-    roleNames.insert(TestDataRole, "modeldata");
-    setRoleNames(roleNames);
 }
 
 QDeclarativeLocationTestModel::~QDeclarativeLocationTestModel()
@@ -257,3 +252,10 @@ QVariant QDeclarativeLocationTestModel::data(const QModelIndex& index, int role)
     }
     return QVariant();
 }
+
+QHash<int, QByteArray> QDeclarativeLocationTestModel::roleNames() const
+{
+    QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
+    roles.insert(TestDataRole, "modeldata");
+    return roles;
+}
diff --git a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h
index 4ad14348..1244b3fc 100644
--- a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h
+++ b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h
@@ -87,6 +87,7 @@ public:
     // From QAbstractListModel
     virtual int rowCount(const QModelIndex &parent) const;
     virtual QVariant data(const QModelIndex &index, int role) const;
+    virtual QHash<int, QByteArray> roleNames() const;
 
     int datacount() const;
     void setDatacount(int datacount);