diff options
author | Sergio Martins <sergio.martins@kdab.com> | 2018-02-02 11:44:22 +0000 |
---|---|---|
committer | Sérgio Martins <sergio.martins@kdab.com> | 2018-02-05 15:54:34 +0000 |
commit | cf1b732e21b8768c0e423f900a3f11f923863edd (patch) | |
tree | 0e875743d56b140c75cc4b30654c7cc8213b4471 /src/widgets/kernel/qlayout.h | |
parent | 2e0849e79c851318da0f148dd4002b02cea66dbe (diff) |
Introduce QT6_VIRTUAL and QT6_NOT_VIRTUAL macros
To avoid QT_VERSION_CHECK ifdefs
Change-Id: I364903964c72f4df19b8b7c10c19b82d24f63600
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/widgets/kernel/qlayout.h')
-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 abadf2e69d..bcc33a0811 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -126,8 +126,8 @@ public: bool isEmpty() const override; QSizePolicy::ControlTypes controlTypes() const override; - // ### Qt 6 make this function virtual - QLayoutItem *replaceWidget(QWidget *from, QWidget *to, Qt::FindChildOptions options = Qt::FindChildrenRecursively); + QT6_VIRTUAL QLayoutItem *replaceWidget(QWidget *from, QWidget *to, + Qt::FindChildOptions options = Qt::FindChildrenRecursively); int totalHeightForWidth(int w) const; QSize totalMinimumSize() const; |