From 68edaccf80ec8fea4fb841a1ca0d2ecc0e388aee Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sat, 11 Jun 2016 21:41:18 +0300 Subject: Don't use deprecated version suffixes of QStyleOption* classes. They are deprecated since Qt 5.0. Change-Id: Id6df1fa1eec1e1f6bee863d7c00f37a599dd49f3 Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/WebKit/qt/WidgetSupport') diff --git a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp index 5c22d96b7..6881d9d74 100644 --- a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp +++ b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp @@ -209,7 +209,7 @@ int QStyleFacadeImp::sliderThickness(Qt::Orientation orientation) const int QStyleFacadeImp::progressBarChunkWidth(const QSize& size) const { - QStyleOptionProgressBarV2 option; + QStyleOptionProgressBar option; option.rect.setSize(size); // FIXME: Until http://bugreports.qt.nokia.com/browse/QTBUG-9171 is fixed, // we simulate one square animating across the progress bar. @@ -263,10 +263,10 @@ void QStyleFacadeImp::paintTextField(QPainter *painter, const QStyleFacadeOption { QWidget* widget = qobject_cast(widgetForPainter(painter)); - MappedStyleOption panel(widget, proxyOption); + MappedStyleOption panel(widget, proxyOption); panel.lineWidth = findFrameLineWidth(); - panel.features = QStyleOptionFrameV2::None; + panel.features = QStyleOptionFrame::None; style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, painter, widget); } @@ -389,7 +389,7 @@ void QStyleFacadeImp::paintProgressBar(QPainter* painter, const QStyleFacadeOpti { QWidget* widget = qobject_cast(widgetForPainter(painter)); - MappedStyleOption option(widget, proxyOption); + MappedStyleOption option(widget, proxyOption); option.maximum = std::numeric_limits::max(); option.minimum = 0; -- cgit v1.2.1