diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-15 19:12:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-15 19:12:44 +0200 |
| commit | 052e65994595144eb1dcc729e3584e1b56f07cd0 (patch) | |
| tree | d94f6042c3b15738b6b5cc7062b86841f8e584ef | |
| parent | 98678e1ae981e2e7d52ac283028e352a1cba794a (diff) | |
| parent | 4afc16838f72b94ac1c73da6a8b215bebce30037 (diff) | |
| download | qtwebkit-052e65994595144eb1dcc729e3584e1b56f07cd0.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I842c8369d9c8647c62d9f1219d65e7a5bca0bf70
| -rw-r--r-- | Source/WTF/wtf/FeatureDefines.h | 9 | ||||
| -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 |
4 files changed, 15 insertions, 6 deletions
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) 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 { |