diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-28 16:39:37 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:01 +0000 |
| commit | 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (patch) | |
| tree | 322337ad0acbc75732f916376ec6d36e7ec0e5bc /Tools/QtTestBrowser | |
| parent | 6882a04fb36642862b11efe514251d32070c3d65 (diff) | |
| download | qtwebkit-9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c.tar.gz | |
Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3
Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools/QtTestBrowser')
| -rw-r--r-- | Tools/QtTestBrowser/webpage.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Tools/QtTestBrowser/webpage.h b/Tools/QtTestBrowser/webpage.h index 959318018..1a6ef2e38 100644 --- a/Tools/QtTestBrowser/webpage.h +++ b/Tools/QtTestBrowser/webpage.h @@ -42,17 +42,17 @@ class WebPage : public QWebPage { public: WebPage(QObject* parent = 0); - virtual QWebPage* createWindow(QWebPage::WebWindowType); - virtual QObject* createPlugin(const QString&, const QUrl&, const QStringList&, const QStringList&); - virtual bool supportsExtension(QWebPage::Extension) const; - virtual bool extension(Extension, const ExtensionOption*, ExtensionReturn*); + QWebPage* createWindow(QWebPage::WebWindowType) override; + QObject* createPlugin(const QString&, const QUrl&, const QStringList&, const QStringList&) override; + bool supportsExtension(QWebPage::Extension) const override; + bool extension(Extension, const ExtensionOption*, ExtensionReturn*) override; - virtual bool acceptNavigationRequest(QWebFrame*, const QNetworkRequest&, NavigationType); + bool acceptNavigationRequest(QWebFrame*, const QNetworkRequest&, NavigationType) override; - QString userAgentForUrl(const QUrl&) const; + QString userAgentForUrl(const QUrl&) const override; void setInterruptingJavaScriptEnabled(bool enabled) { m_interruptingJavaScriptEnabled = enabled; } - virtual bool shouldInterruptJavaScript(); + bool shouldInterruptJavaScript() override; void javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID) override; |