summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/itemviews
diff options
context:
space:
mode:
authorAlbert Astals Cid <albert.astals.cid@kdab.com>2019-01-30 10:36:45 +0100
committerAlbert Astals Cid <albert.astals.cid@kdab.com>2019-02-11 09:49:37 +0000
commitf88e78fd198c8bbc527da2e7426a010580f18c9f (patch)
treec6afcfe1258024915dfb1390d22e798da2a19dfc /tests/auto/widgets/itemviews
parent35a30c7ebbd50e8b5b1fad7c00bd6c36b0dca8b9 (diff)
test: Make qheaderview test build
it's using deprecated reset() model that we don't support anymore since "this is Qt6", so include the 2 lines in the code. This makes for bad code but since it's a test and it used to work i guess it's good enough Change-Id: Ia906fe40359ddc0defb10795cf12a17498124983 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'tests/auto/widgets/itemviews')
-rw-r--r--tests/auto/widgets/itemviews/CMakeLists.txt2
-rw-r--r--tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp6
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/widgets/itemviews/CMakeLists.txt b/tests/auto/widgets/itemviews/CMakeLists.txt
index a1bbf052e8..e7dc78b18c 100644
--- a/tests/auto/widgets/itemviews/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory(qabstractitemview)
add_subdirectory(qdatawidgetmapper)
add_subdirectory(qdirmodel)
add_subdirectory(qfileiconprovider)
-# add_subdirectory(qheaderview) ## FIXME: Fails to build!
+add_subdirectory(qheaderview)
add_subdirectory(qitemdelegate)
add_subdirectory(qitemeditorfactory)
add_subdirectory(qitemview)
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index b6932d4892..e51a915401 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -85,7 +85,8 @@ class XResetModel : public QStandardItemModel
blockSignals(true);
bool r = QStandardItemModel::removeRows(row, count, parent);
blockSignals(false);
- emit reset();
+ beginResetModel();
+ endResetModel();
return r;
}
virtual bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex())
@@ -93,7 +94,8 @@ class XResetModel : public QStandardItemModel
blockSignals(true);
bool r = QStandardItemModel::insertRows(row, count, parent);
blockSignals(false);
- emit reset();
+ beginResetModel();
+ endResetModel();
return r;
}
};