From 40d528d9fd9a4ce3b97f79b31545e7709a5d3588 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 15 Jun 2018 12:31:07 -0700 Subject: QToolbar: Un-hide the QLayout::indexOf non-virtual Breaks the build with QT6_VIRTUAL qtoolbarlayout_p.h:99:9: error: 'QToolBarLayout::indexOf' hides overloaded virtual function [-Werror,-Woverloaded-virtual] Change-Id: I6efb28c3145047559ec0fffd15386c39739b42f9 Reviewed-by: David Faure --- src/widgets/widgets/qtoolbarlayout_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets/widgets/qtoolbarlayout_p.h') diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h index b813cd5e2c..a788d30450 100644 --- a/src/widgets/widgets/qtoolbarlayout_p.h +++ b/src/widgets/widgets/qtoolbarlayout_p.h @@ -97,7 +97,7 @@ public: void insertAction(int index, QAction *action); int indexOf(QAction *action) const; - int indexOf(QWidget *widget) const override { return QLayout::indexOf(widget); } + using QLayout::indexOf; // bring back the hidden members bool layoutActions(const QSize &size); QSize expandedSize(const QSize &size) const; -- cgit v1.2.3