Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0 for simple cases.

Fix usage of API that is marked deprecated.

Change-Id: Ia887437f99b9ce207891ca19bc49294acb7d629d
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>

2 files changed, 10 insertions, 5 deletions

diff --git a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
index d9aff688ab..9222e39477 100644
--- a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
+++ b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
@@ -11,4 +11,3 @@ TESTDATA = data/*
 
 QT += core-private gui-private qml-private quick-private testlib
 qtHaveModule(widgets): QT += widgets
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index d578a0900c..a1d8779555 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -102,15 +102,20 @@ public:
     };
 
     SingleRoleModel(const QStringList &list = QStringList(), const QByteArray &role = "name", QObject *parent = 0)
-        : QAbstractItemModel(parent) {
-        QHash<int, QByteArray> roles;
-        roles.insert(Qt::DisplayRole , role);
-        setRoleNames(roles);
+        : QAbstractItemModel(parent), m_role(role)
+    {
         foreach (const QString &string, list)
             trunk.children.append(Node(string));
     }
     ~SingleRoleModel() {}
 
+    QHash<int,QByteArray> roleNames() const
+    {
+        QHash<int,QByteArray> roles;
+        roles.insert(Qt::DisplayRole, m_role);
+        return roles;
+    }
+
     Branch *branchForIndex(const QModelIndex &index) const {
         return index.isValid()
                 ? static_cast<Branch *>(index.internalPointer())->children.at(index.row()).branch
@@ -235,6 +240,7 @@ public slots:
     }
 
 private:
+    const QByteArray m_role;
     Branch trunk;
 };