summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-01-24 16:08:05 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-01-25 08:37:19 +0000
commit9ad76503b1e301a64637b3a3073e963d962e642f (patch)
tree5f080d35a8ce1359a4d1f75b7bf1ff76d88ba9ea
parent49e009c9b783756dd48d00f85dbe9e5f117e278b (diff)
downloadqttools-9ad76503b1e301a64637b3a3073e963d962e642f.tar.gz
QLayoutSupport: fix GCC 13 -Werror=overloaded-virtual
Says GCC 13: layoutdecoration.h:52:17: error: ‘virtual int Qt6::QDesignerLayoutDecorationExtension::findItemAt(int, int) const’ was hidden [-Werror=overloaded-virtual=] 52 | virtual int findItemAt(int row, int column) const = 0; // atm only for grid. | ^~~~~~~~~~ qlayout_widget_p.h:178:16: note: by ‘Qt6::qdesigner_internal::QLayoutSupport::findItemAt’ 178 | static int findItemAt(QGridLayout *, int row, int column); | ^~~~~~~~~~ Fix by adding the missing using declaration that brings QDesignerLayoutDecorationExtension::findItemAt(int, int) into scope again. Change-Id: I69b3033fa2da30388f87229cd2ab26822bab0d16 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 345d33893e15124a795a39a4a8614286cbf7faf9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/designer/src/lib/shared/qlayout_widget_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/designer/src/lib/shared/qlayout_widget_p.h b/src/designer/src/lib/shared/qlayout_widget_p.h
index e70ec552a..d07be3555 100644
--- a/src/designer/src/lib/shared/qlayout_widget_p.h
+++ b/src/designer/src/lib/shared/qlayout_widget_p.h
@@ -176,6 +176,7 @@ public:
// grid helpers: find item index
static int findItemAt(QGridLayout *, int row, int column);
+ using QDesignerLayoutDecorationExtension::findItemAt;
// grid helpers: Quick check whether simplify should be enabled for grids. May return false positives.
static bool canSimplifyQuickCheck(const QGridLayout *);
static bool canSimplifyQuickCheck(const QFormLayout *fl);