summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/qt')
-rw-r--r--Source/WebKit/qt/Api/qwebhistoryinterface.h2
-rw-r--r--Source/WebKit/qt/Api/qwebpluginfactory.h4
-rw-r--r--Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp8
-rw-r--r--Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp1
-rw-r--r--Source/WebKit/qt/WidgetApi/qgraphicswebview.h6
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebinspector.h2
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebpage.h6
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebview.h4
-rw-r--r--Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp8
-rw-r--r--Source/WebKit/qt/declarative/experimental/experimental.pri11
-rw-r--r--Source/WebKit/qt/declarative/public.pri11
-rw-r--r--Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro3
-rw-r--r--Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp8
13 files changed, 31 insertions, 43 deletions
diff --git a/Source/WebKit/qt/Api/qwebhistoryinterface.h b/Source/WebKit/qt/Api/qwebhistoryinterface.h
index a49c58684..3038d22bd 100644
--- a/Source/WebKit/qt/Api/qwebhistoryinterface.h
+++ b/Source/WebKit/qt/Api/qwebhistoryinterface.h
@@ -29,7 +29,7 @@
class QWEBKIT_EXPORT QWebHistoryInterface : public QObject {
Q_OBJECT
public:
- QWebHistoryInterface(QObject *parent = 0);
+ explicit QWebHistoryInterface(QObject *parent = Q_NULLPTR);
~QWebHistoryInterface();
static void setDefaultInterface(QWebHistoryInterface *defaultInterface);
diff --git a/Source/WebKit/qt/Api/qwebpluginfactory.h b/Source/WebKit/qt/Api/qwebpluginfactory.h
index 24084fe18..26f855066 100644
--- a/Source/WebKit/qt/Api/qwebpluginfactory.h
+++ b/Source/WebKit/qt/Api/qwebpluginfactory.h
@@ -48,7 +48,7 @@ public:
QList<MimeType> mimeTypes;
};
- explicit QWebPluginFactory(QObject* parent = 0);
+ explicit QWebPluginFactory(QObject* parent = Q_NULLPTR);
virtual ~QWebPluginFactory();
virtual QList<Plugin> plugins() const = 0;
@@ -62,7 +62,7 @@ public:
{};
class ExtensionReturn
{};
- virtual bool extension(Extension extension, const ExtensionOption* option = 0, ExtensionReturn* output = 0);
+ virtual bool extension(Extension extension, const ExtensionOption* option = Q_NULLPTR, ExtensionReturn* output = Q_NULLPTR);
virtual bool supportsExtension(Extension extension) const;
private:
diff --git a/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp b/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp
index a8487f2c4..7fcf3de45 100644
--- a/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp
@@ -200,14 +200,14 @@ bool PlatformStrategiesQt::isLinkVisited(Page* page, LinkHash hash, const KURL&
{
ASSERT(hash);
- Vector<UChar, 512> url;
- visitedURL(baseURL, attributeURL, url);
-
// If the Qt4.4 interface for the history is used, we will have to fallback
// to the old global history.
QWebHistoryInterface* iface = QWebHistoryInterface::defaultInterface();
- if (iface)
+ if (iface) {
+ Vector<UChar, 512> url;
+ visitedURL(baseURL, attributeURL, url);
return iface->historyContains(QString(reinterpret_cast<QChar*>(url.data()), url.size()));
+ }
return page->group().isLinkVisited(hash);
}
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
index d1a7f6cab..554ab8927 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
@@ -1179,6 +1179,7 @@ void QWebPageAdapter::triggerAction(QWebPageAdapter::MenuAction action, QWebHitT
case ToggleMediaPlayPause:
if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode))
mediaElt->togglePlayState();
+ break;
case ToggleMediaMute:
if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode))
mediaElt->setMuted(!mediaElt->muted());
diff --git a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
index c9e61f75a..0d990086f 100644
--- a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
+++ b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
@@ -54,7 +54,7 @@ class QWEBKITWIDGETS_EXPORT QGraphicsWebView : public QGraphicsWidget {
Q_FLAGS(QPainter::RenderHints)
public:
- explicit QGraphicsWebView(QGraphicsItem* parent = 0);
+ explicit QGraphicsWebView(QGraphicsItem* parent = Q_NULLPTR);
~QGraphicsWebView();
QWebPage* page() const;
@@ -84,7 +84,7 @@ public:
QAction* pageAction(QWebPage::WebAction action) const;
void triggerPageAction(QWebPage::WebAction action, bool checked = false);
- bool findText(const QString& subString, QWebPage::FindFlags options = 0);
+ bool findText(const QString& subString, QWebPage::FindFlags options = QWebPage::FindFlags());
bool resizesToContents() const;
void setResizesToContents(bool enabled);
@@ -94,7 +94,7 @@ public:
virtual void setGeometry(const QRectF& rect);
virtual void updateGeometry();
- virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = 0);
+ virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = Q_NULLPTR);
virtual QVariant itemChange(GraphicsItemChange change, const QVariant& value);
virtual bool event(QEvent*);
diff --git a/Source/WebKit/qt/WidgetApi/qwebinspector.h b/Source/WebKit/qt/WidgetApi/qwebinspector.h
index c333fa25a..d6a4aad3c 100644
--- a/Source/WebKit/qt/WidgetApi/qwebinspector.h
+++ b/Source/WebKit/qt/WidgetApi/qwebinspector.h
@@ -30,7 +30,7 @@ class QWebInspectorPrivate;
class QWEBKITWIDGETS_EXPORT QWebInspector : public QWidget {
Q_OBJECT
public:
- QWebInspector(QWidget* parent = 0);
+ explicit QWebInspector(QWidget* parent = Q_NULLPTR);
~QWebInspector();
void setPage(QWebPage* page);
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.h b/Source/WebKit/qt/WidgetApi/qwebpage.h
index 24fe1383e..a9c71fd42 100644
--- a/Source/WebKit/qt/WidgetApi/qwebpage.h
+++ b/Source/WebKit/qt/WidgetApi/qwebpage.h
@@ -265,7 +265,7 @@ public:
};
- explicit QWebPage(QObject *parent = 0);
+ explicit QWebPage(QObject *parent = Q_NULLPTR);
~QWebPage();
QWebFrame *mainFrame() const;
@@ -317,7 +317,7 @@ public:
QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
- bool findText(const QString &subString, FindFlags options = 0);
+ bool findText(const QString &subString, FindFlags options = FindFlags());
void setForwardUnsupportedContent(bool forward);
bool forwardUnsupportedContent() const;
@@ -383,7 +383,7 @@ public:
};
- virtual bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0);
+ virtual bool extension(Extension extension, const ExtensionOption *option = Q_NULLPTR, ExtensionReturn *output = Q_NULLPTR);
virtual bool supportsExtension(Extension extension) const;
QWebPageAdapter* handle() const;
diff --git a/Source/WebKit/qt/WidgetApi/qwebview.h b/Source/WebKit/qt/WidgetApi/qwebview.h
index 43439dfa5..ac0946773 100644
--- a/Source/WebKit/qt/WidgetApi/qwebview.h
+++ b/Source/WebKit/qt/WidgetApi/qwebview.h
@@ -54,7 +54,7 @@ class QWEBKITWIDGETS_EXPORT QWebView : public QWidget {
Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints)
Q_FLAGS(QPainter::RenderHints)
public:
- explicit QWebView(QWidget* parent = 0);
+ explicit QWebView(QWidget* parent = Q_NULLPTR);
virtual ~QWebView();
QWebPage* page() const;
@@ -104,7 +104,7 @@ public:
void setRenderHints(QPainter::RenderHints hints);
void setRenderHint(QPainter::RenderHint hint, bool enabled = true);
- bool findText(const QString& subString, QWebPage::FindFlags options = 0);
+ bool findText(const QString& subString, QWebPage::FindFlags options = QWebPage::FindFlags());
virtual bool event(QEvent*);
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/Source/WebKit/qt/declarative/experimental/experimental.pri b/Source/WebKit/qt/declarative/experimental/experimental.pri
index 547e66bcc..c59f4569e 100644
--- a/Source/WebKit/qt/declarative/experimental/experimental.pri
+++ b/Source/WebKit/qt/declarative/experimental/experimental.pri
@@ -11,14 +11,9 @@ TARGET.module_name = QtWebKit/experimental
CONFIG += plugin
-QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
-copy2build.input = QMLDIRFILE
-copy2build.output = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}/qmldir
-!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
-copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copy2build.name = COPY ${QMAKE_FILE_IN}
-copy2build.CONFIG += no_link
-QMAKE_EXTRA_COMPILERS += copy2build
+cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir
+cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
+COPIES += cpqmldir
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
diff --git a/Source/WebKit/qt/declarative/public.pri b/Source/WebKit/qt/declarative/public.pri
index d669162e4..bdef38045 100644
--- a/Source/WebKit/qt/declarative/public.pri
+++ b/Source/WebKit/qt/declarative/public.pri
@@ -11,14 +11,9 @@ TARGET.module_name = QtWebKit
CONFIG += plugin
-QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
-copy2build.input = QMLDIRFILE
-copy2build.output = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}/qmldir
-!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
-copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copy2build.name = COPY ${QMAKE_FILE_IN}
-copy2build.CONFIG += no_link
-QMAKE_EXTRA_COMPILERS += copy2build
+cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir
+cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
+COPIES += cpqmldir
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
diff --git a/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro b/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro
index 0e49a7056..99197e1bb 100644
--- a/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro
+++ b/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro
@@ -1,6 +1,3 @@
-# -------------------------------------------------
-# Project created by QtCreator 2009-12-10T11:25:02
-# -------------------------------------------------
include(../tests.pri)
TARGET = hybridPixmap
SOURCES += widget.cpp
diff --git a/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp b/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp
index 94551eb8e..52e6422b1 100644
--- a/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp
+++ b/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp
@@ -1572,26 +1572,26 @@ void tst_QObjectBridge::connectAndDisconnect()
QString type;
QString ret = evalJS("(function() { }).connect()", type);
QCOMPARE(type, sError);
- QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating '(function() { }).connect()')"));
+ QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating '(function() { }).connect()')"));
}
{
QString type;
QString ret = evalJS("var o = { }; o.connect = Function.prototype.connect; o.connect()", type);
QCOMPARE(type, sError);
- QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating 'o.connect()')"));
+ QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating 'o.connect()')"));
}
{
QString type;
QString ret = evalJS("(function() { }).connect(123)", type);
QCOMPARE(type, sError);
- QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating '(function() { }).connect(123)')"));
+ QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating '(function() { }).connect(123)')"));
}
{
QString type;
QString ret = evalJS("var o = { }; o.connect = Function.prototype.connect; o.connect(123)", type);
QCOMPARE(type, sError);
- QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating 'o.connect(123)')"));
+ QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating 'o.connect(123)')"));
}
{
View Lorry Controller Status