diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-06-15 12:31:07 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-06-18 19:53:22 +0000 |
| commit | 40d528d9fd9a4ce3b97f79b31545e7709a5d3588 (patch) | |
| tree | bacf331f47ad0955ba828e7ed522b76a41b1f38d /src/widgets/widgets/qtoolbarlayout_p.h | |
| parent | 150b9327a4cb47a482b9690a4d355da4d058e9c8 (diff) | |
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 <david.faure@kdab.com>
Diffstat (limited to 'src/widgets/widgets/qtoolbarlayout_p.h')
| -rw-r--r-- | src/widgets/widgets/qtoolbarlayout_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |