diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-08-16 13:55:11 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-08-26 18:02:58 +0200 |
commit | c501e09efacb8a60deb41f85f3402f6f4c041d95 (patch) | |
tree | ba3696c02eeff30279383dd618c7e39638445e37 /tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp | |
parent | 70f7c484c39dd5581160a8c3fa475ee108c4920d (diff) |
Replace QAbstractItemView::viewOptions with initViewItemOption
viewOptions returned a QStyleOptionViewItem object. Such a method
can never support newer versions of the option structure.
Most styleable QWidget classes provide a virtual method
initStyleOption that initializes the option object passed in as a
pointer, e.g QFrame, QAbstractSpinBox, or QComboBox.
Follow that API convention, but name it initViewItemOption, as the
QStyleOptionViewItem struct contains information about the item as
well as the widget itelf.
This is a source incompatible change that will go unnoticed unless
existing subclasses mark their overrides as 'override', or call
the removed QAbstractItemView::viewOption virtual function.
[ChangeLog][QtWidgets][QAbstractItemView] The virtual viewOptions
method that previously returned a QStyleOptionViewItem object has
been renamed to initViewItemOption, and initializes a
QStyleOptionViewItem object that's passed in through a pointer.
Change-Id: Ie058702aed42d77274fa3c4abb43ba302e57e348
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp')
-rw-r--r-- | tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 02be27ffc7..2517d3bd5a 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -516,8 +516,8 @@ void tst_QAbstractItemView::basic_tests(QAbstractItemView *view) #if QT_CONFIG(draganddrop) if (!view->model()) view->startDrag(Qt::CopyAction); - - view->viewOptions(); + QStyleOptionViewItem option; + view->initViewItemOption(&option); view->setState(QAbstractItemView::NoState); QCOMPARE(view->state(), QAbstractItemView::NoState); |