From 9dc738821e6618b1ba51b46f98205acfe74cbea4 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Fri, 20 Apr 2012 21:12:12 +0200
Subject: Do not use deprecated API

Change-Id: I0c61f9cb4abe926d5f1e0a3acda7117d8d54efb6
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
---
 src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/imports/folderlistmodel/qquickfolderlistmodel.cpp')

diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 0aabb7ae74..b937fbdbc3 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -274,8 +274,6 @@ QQuickFolderListModel::QQuickFolderListModel(QObject *parent)
     d->roleNames[FileLastModifiedRole] = "fileModified";
     d->roleNames[FileLastReadRole] = "fileAccessed";
     d->roleNames[FileIsDirRole] = "fileIsDir";
-    setRoleNames(d->roleNames);
-
     d->init();
 }
 
@@ -323,6 +321,12 @@ QVariant QQuickFolderListModel::data(const QModelIndex &index, int role) const
     return rv;
 }
 
+QHash<int, QByteArray> QQuickFolderListModel::roleNames() const
+{
+    Q_D(const QQuickFolderListModel);
+    return d->roleNames;
+}
+
 /*!
     \qmlproperty int FolderListModel::count
 
-- 
cgit v1.2.3