[Libreoffice-commits] core.git: vcl/qt5

Michael Weghorn (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 24 11:59:30 UTC 2021


 vcl/qt5/Qt5Graphics_Controls.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit d0c2e5dde094c4e18e63e665e20e5d781fd90753
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Fri Sep 24 08:48:37 2021 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Sep 24 13:58:54 2021 +0200

    qt5: Don't use deprecated QStyleOptionProgressBarV2 typedef
    
    'QStyleOptionProgressBarV2' is just a typedef for
    'QStyleOptionProgressBar' in Qt 5 and has been
    removed in Qt 6.
    
    Change-Id: I7ee63d0ebe6b035b6048e54a94c98ca54942a7d4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122555
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/qt5/Qt5Graphics_Controls.cxx b/vcl/qt5/Qt5Graphics_Controls.cxx
index 9d6779621234..4847603bf8ab 100644
--- a/vcl/qt5/Qt5Graphics_Controls.cxx
+++ b/vcl/qt5/Qt5Graphics_Controls.cxx
@@ -665,9 +665,7 @@ bool Qt5Graphics_Controls::drawNativeControl(ControlType type, ControlPart part,
     }
     else if (type == ControlType::Progress && part == ControlPart::Entire)
     {
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        QStyleOptionProgressBarV2 option;
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        QStyleOptionProgressBar option;
         option.minimum = 0;
         option.maximum = widgetRect.width();
         option.progress = value.getNumericVal();


More information about the Libreoffice-commits mailing list