diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-21 14:59:47 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-14 09:47:50 +0200 |
| commit | c4378b8620453cd4bfaf12e45f623b3bdc1038e2 (patch) | |
| tree | 5ae1681715e28164e2f6e59fe5d8de8eb4005da5 /src/widgets/kernel | |
| parent | 6b43b665a8f359f2310851de2e9560091e9726db (diff) | |
Clean up the last of QT6_(NOT_)?VIRTUAL
This follows up on commit d273076b4474bb473d90e996960c4c773745761a
which left a comment asking for the clean-up this finishes.
Task-number: QTBUG-85700
Change-Id: I1c6896a42a09b873302ad7ec8273879f2a4a4ce6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qlayout.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 2748ebab9f..1e51ff8fde 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -123,8 +123,8 @@ public: bool isEmpty() const override; QSizePolicy::ControlTypes controlTypes() const override; - QT6_VIRTUAL QLayoutItem *replaceWidget(QWidget *from, QWidget *to, - Qt::FindChildOptions options = Qt::FindChildrenRecursively); + virtual QLayoutItem *replaceWidget(QWidget *from, QWidget *to, + Qt::FindChildOptions options = Qt::FindChildrenRecursively); int totalHeightForWidth(int w) const; QSize totalMinimumSize() const; |