diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-06-11 21:41:18 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2016-06-15 09:42:28 +0000 |
| commit | 68edaccf80ec8fea4fb841a1ca0d2ecc0e388aee (patch) | |
| tree | 47357880b3cf3b549aa0bbfc97e596da08d5f204 | |
| parent | 28077218067438fef5cdc746feb45ca6d4e755d9 (diff) | |
| download | qtwebkit-68edaccf80ec8fea4fb841a1ca0d2ecc0e388aee.tar.gz | |
Don't use deprecated version suffixes of QStyleOption* classes.
They are deprecated since Qt 5.0.
Change-Id: Id6df1fa1eec1e1f6bee863d7c00f37a599dd49f3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp | 8 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/locationedit.cpp | 2 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/locationedit.h | 2 |
3 files changed, 6 insertions, 6 deletions
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<QWidget*>(widgetForPainter(painter)); - MappedStyleOption<QStyleOptionFrameV2> panel(widget, proxyOption); + MappedStyleOption<QStyleOptionFrame> 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<QWidget*>(widgetForPainter(painter)); - MappedStyleOption<QStyleOptionProgressBarV2> option(widget, proxyOption); + MappedStyleOption<QStyleOptionProgressBar> option(widget, proxyOption); option.maximum = std::numeric_limits<int>::max(); option.minimum = 0; diff --git a/Tools/QtTestBrowser/locationedit.cpp b/Tools/QtTestBrowser/locationedit.cpp index 6489b2b2e..fd86650b5 100644 --- a/Tools/QtTestBrowser/locationedit.cpp +++ b/Tools/QtTestBrowser/locationedit.cpp @@ -80,7 +80,7 @@ void LocationEdit::resizeEvent(QResizeEvent*) void LocationEdit::updateInternalGeometry() { - QStyleOptionFrameV3 styleOption; + QStyleOptionFrame styleOption; initStyleOption(&styleOption); QRect textRect = style()->subElementRect(QStyle::SE_LineEditContents, &styleOption, this); diff --git a/Tools/QtTestBrowser/locationedit.h b/Tools/QtTestBrowser/locationedit.h index dae069d7b..85a7eb763 100644 --- a/Tools/QtTestBrowser/locationedit.h +++ b/Tools/QtTestBrowser/locationedit.h @@ -33,7 +33,7 @@ #include <QIcon> #include <QLabel> #include <QLineEdit> -#include <QStyleOptionFrameV3> +#include <QStyleOptionFrame> #include <QTimer> class LocationEdit : public QLineEdit { |