summaryrefslogtreecommitdiffstats
path: root/tests/auto/other/modeltest
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-08-24 13:35:22 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-08-31 19:56:59 +0000
commit50b9e30970effae249010338880f74641f188f76 (patch)
tree472e644f7b4799a562cdcfea9ed327341925ecad /tests/auto/other/modeltest
parent1ca789bfe3c5617efdec698e4f5377c0611589d2 (diff)
qtbase tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0 for simple cases.
Fix usage of API that is marked deprecated. Change-Id: Ie31b6ee029c5b5f015fe52fb9bcd8e94b22d6cd0 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'tests/auto/other/modeltest')
-rw-r--r--tests/auto/other/modeltest/dynamictreemodel.cpp3
-rw-r--r--tests/auto/other/modeltest/modeltest.pro4
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/other/modeltest/dynamictreemodel.cpp b/tests/auto/other/modeltest/dynamictreemodel.cpp
index c7cf04231f..bdf2b604fd 100644
--- a/tests/auto/other/modeltest/dynamictreemodel.cpp
+++ b/tests/auto/other/modeltest/dynamictreemodel.cpp
@@ -299,7 +299,8 @@ bool ModelResetCommand::emitPreSignal(const QModelIndex &srcParent, int srcStart
void ModelResetCommand::emitPostSignal()
{
- m_model->reset();
+ m_model->beginResetModel();
+ m_model->endResetModel();
}
ModelResetCommandFixed::ModelResetCommandFixed(DynamicTreeModel* model, QObject* parent)
diff --git a/tests/auto/other/modeltest/modeltest.pro b/tests/auto/other/modeltest/modeltest.pro
index 045299e095..8e96058449 100644
--- a/tests/auto/other/modeltest/modeltest.pro
+++ b/tests/auto/other/modeltest/modeltest.pro
@@ -3,7 +3,3 @@ TARGET = tst_modeltest
QT += widgets testlib
SOURCES += tst_modeltest.cpp modeltest.cpp dynamictreemodel.cpp
HEADERS += modeltest.h dynamictreemodel.h
-
-
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0