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 ++++---- Tools/QtTestBrowser/locationedit.cpp | 2 +- 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(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; 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 #include #include -#include +#include #include class LocationEdit : public QLineEdit { -- cgit v1.2.1 From 4afc16838f72b94ac1c73da6a8b215bebce30037 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 15 Jun 2016 16:20:43 +0300 Subject: Only Mac port needs ObjC API for JSC. Change-Id: I32d6029139ac5b8118c3a350b68d6e55c8093a1a Reviewed-by: Allan Sandfeld Jensen --- Source/WTF/wtf/FeatureDefines.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Source/WTF/wtf/FeatureDefines.h b/Source/WTF/wtf/FeatureDefines.h index 7329c95f5..e1007923c 100644 --- a/Source/WTF/wtf/FeatureDefines.h +++ b/Source/WTF/wtf/FeatureDefines.h @@ -188,6 +188,15 @@ #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */ +#if !PLATFORM(MAC) + +#if !defined(JSC_OBJC_API_ENABLED) +#define JSC_OBJC_API_ENABLED 0 +#endif + +#endif /* !PLATFORM(MAC) */ + + /* --------- Apple Windows port --------- */ #if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO) -- cgit v1.2.1