From d82404428460a203daf1d0cc67fcc6b8a03f514c Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 26 Oct 2018 21:33:33 +0200 Subject: [PATCH] QCommandLinkButton: fix visibility of some public functions The three public functions heightForWidth/minimumSizeHint/sizeHint were accidentally marked as protected in QCommandLinkButton. This patch makes sure it get fixed with Qt6. Fixes: QTBUG-68722 Change-Id: I577e48cbe9274c8506a555dae1ec81044a889d6e Reviewed-by: Samuel Gaist Reviewed-by: Luca Beldi Reviewed-by: Richard Moe Gustavsen --- src/widgets/widgets/qcommandlinkbutton.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index 2d01d63df8..3d2dd5784d 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -66,10 +66,16 @@ public: QString description() const; void setDescription(const QString &description); + // QTBUG-68722 +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) protected: +#else +public: +#endif QSize sizeHint() const override; int heightForWidth(int) const override; QSize minimumSizeHint() const override; +protected: bool event(QEvent *e) override; void paintEvent(QPaintEvent *) override;