diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-11-08 13:22:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-10 14:09:55 +0100 |
| commit | 8462a6933c843eeed2d94d83d4b10f7c946a5475 (patch) | |
| tree | a01876a5b5fd588a6382aa93677afe539baf2eff /src/widgets/kernel/qlayout.h | |
| parent | 9af6fd5d8a2d142742ad690286f50c7aac34908c (diff) | |
Remove a boolean trap in QLayout::replaceWidget
Use some flags instead.
Task-number: QTBUG-34668
Change-Id: I9a75253c8eb98164c594bb6bb06c1a16c9609537
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/kernel/qlayout.h')
| -rw-r--r-- | src/widgets/kernel/qlayout.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index ca5f6d42ea..27d9d34b9c 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -130,7 +130,9 @@ public: virtual int count() const = 0; bool isEmpty() const; QSizePolicy::ControlTypes controlTypes() const; - QLayoutItem* replaceWidget(QWidget *from, QWidget *to, bool recursive = true); + + // ### Qt 6 make this function virtual + QLayoutItem *replaceWidget(QWidget *from, QWidget *to, Qt::FindChildOptions options = Qt::FindChildrenRecursively); int totalHeightForWidth(int w) const; QSize totalMinimumSize() const; |