1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull QWidget::setTabOrder(std::initializer_list...) behind ABI boundary

Browse Source 
Found in API-review.

Change-Id: I261aa450d25288e7a3e8caa033ce5000e5dd77f2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit a27cc5d72735dfd1504bb0be02f180a61932abc7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Axel Spoerl 2023-08-09 11:33:35 +02:00 committed by Qt Cherry-pick Bot
parent 5fb1bec201
commit e03c895be6
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/widgets/kernel/qwidget.cpp
View File

@ -7091,6 +7091,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 /*!\internal
Moves the relevant subwidgets of this widget from the \a oldtlw's Moves the relevant subwidgets of this widget from the \a oldtlw's

15
src/widgets/kernel/qwidget.h
View File

@ -432,7 +432,7 @@ public:
void setFocusPolicy(Qt::FocusPolicy policy); void setFocusPolicy(Qt::FocusPolicy policy);
bool hasFocus() const; bool hasFocus() const;
static void setTabOrder(QWidget *, QWidget *); 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 *); void setFocusProxy(QWidget *);
QWidget *focusProxy() const; QWidget *focusProxy() const;
Qt::ContextMenuPolicy contextMenuPolicy() const; Qt::ContextMenuPolicy contextMenuPolicy() const;
@ -914,19 +914,6 @@ inline bool QWidget::testAttribute(Qt::WidgetAttribute attribute) const
return testAttribute_helper(attribute); 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) #define QWIDGETSIZE_MAX ((1<<24)-1)
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM