diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 08:53:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 08:54:41 +0100 |
| commit | bb9f65f54ee866eced8e157b59e64d05a52aa3a5 (patch) | |
| tree | 07898105fe79caed5fa3bbdbb9d6752ee6928c0f /Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h | |
| parent | b9ce7cfc7f14b96b0b573f56f792fb3a55ac60f9 (diff) | |
| parent | ed84b8b4ff88c5affaa89edb72e6aaf481f3ccc1 (diff) | |
| download | qtwebkit-5.7.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Change-Id: I8ffa0181ef59a4fcec216f15413171cbc5b1daed
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h b/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h index 10b2f697e..2d903e9cd 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h @@ -36,7 +36,7 @@ public: static QString identifier() { return QStringLiteral("webicon"); } QUrl iconURLForPageURLInContext(const QString& pageURL, WebKit::QtWebContext* context); - virtual QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize); + QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize) Q_DECL_OVERRIDE; }; #endif |