summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Spoerl <axel.spoerl@qt.io>2023-08-09 11:33:35 +0200
committerMarc Mutz <marc.mutz@qt.io>2023-08-11 18:54:03 +0000
commita27cc5d72735dfd1504bb0be02f180a61932abc7 (patch)
tree6c57fbc4178dc3b9993ac31d312a9f83fd994327
parent1530731694a247b91fe63c9916c51361fdb9ad67 (diff)
Pull QWidget::setTabOrder(std::initializer_list...) behind ABI boundary
Found in API-review. Pick-to: 6.6 Change-Id: I261aa450d25288e7a3e8caa033ce5000e5dd77f2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io>
-rw-r--r--src/widgets/kernel/qwidget.cpp14
-rw-r--r--src/widgets/kernel/qwidget.h15
2 files changed, 15 insertions, 14 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index b8ae2875a8..f893dcda3d 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -7085,6 +7085,20 @@ void QWidget::setTabOrder(QWidget* first, QWidget *second)
}
}
+void QWidget::setTabOrder(std::initializer_list<QWidget *> widgets)
+{
+ QWidget *prev = nullptr;
+ for (const auto &widget : widgets) {
+ if (!prev) {
+ prev = widget;
+ } else {
+ QWidget::setTabOrder(prev, widget);
+ prev = widget;
+ }
+ }
+}
+
+
/*!\internal
Moves the relevant subwidgets of this widget from the \a oldtlw's
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 4591ab0454..e5e83a43f2 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -432,7 +432,7 @@ public:
void setFocusPolicy(Qt::FocusPolicy policy);
bool hasFocus() const;
static void setTabOrder(QWidget *, QWidget *);
- static inline void setTabOrder(std::initializer_list<QWidget *> widgets);
+ static void setTabOrder(std::initializer_list<QWidget *> widgets);
void setFocusProxy(QWidget *);
QWidget *focusProxy() const;
Qt::ContextMenuPolicy contextMenuPolicy() const;
@@ -914,19 +914,6 @@ inline bool QWidget::testAttribute(Qt::WidgetAttribute attribute) const
return testAttribute_helper(attribute);
}
-inline void QWidget::setTabOrder(std::initializer_list<QWidget *> widgets)
-{
- QWidget *prev = nullptr;
- for (const auto &widget : widgets) {
- if (!prev) {
- prev = widget;
- } else {
- QWidget::setTabOrder(prev, widget);
- prev = widget;
- }
- }
-}
-
#define QWIDGETSIZE_MAX ((1<<24)-1)
#ifndef QT_NO_DEBUG_STREAM