diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-06-08 16:28:58 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-10 23:20:07 +0000 |
| commit | ee3e1886d6154a3faaf7536986e8c70ec4f3c373 (patch) | |
| tree | 0603c3e229f865001cdd4678a2c8812aa1cbd21c /src/core/api/qwebenginepage.cpp | |
| parent | d627842e98c1cbaec0123566dc1af7b6018e5dc1 (diff) | |
Fix some compiler warnings
- Remove deprecated Qt::AA_EnableHighDpiScaling and Qt::AA_UseHighDpiPixmaps
from examples. High-DPI scaling is always enabled.
- Reorder initialization of members of QWebEngineDownloadRequestPrivate.
Also remove m_ prefix from public members' name.
- Remove unused parameters from methods of DummyDelegate.
- Add missing overrides in auto tests.
Change-Id: I18d6973b8bee574b37b73fbaaa8d57002ac8ba2d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 740b8c94f27930a33298c81c2284d1f0a9e2f11b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/core/api/qwebenginepage.cpp')
| -rw-r--r-- | src/core/api/qwebenginepage.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp index 3088133f7..158f79eef 100644 --- a/src/core/api/qwebenginepage.cpp +++ b/src/core/api/qwebenginepage.cpp @@ -104,7 +104,9 @@ public: bool isVisible() const override { Q_UNREACHABLE(); } QWindow *window() const override { return nullptr; } void updateCursor(const QCursor &cursor) override - { /*setCursor(cursor);*/ + { + Q_UNUSED(cursor); + /*setCursor(cursor);*/ } void resize(int width, int height) override { @@ -115,8 +117,8 @@ public: void inputMethodStateChanged(bool, bool) override { } void setInputMethodHints(Qt::InputMethodHints) override { } void setClearColor(const QColor &) override { } - void adapterClientChanged(WebContentsAdapterClient *client) override { } - bool copySurface(const QRect &rect, const QSize &size, QImage &image) + void adapterClientChanged(WebContentsAdapterClient *) override { } + bool copySurface(const QRect &, const QSize &, QImage &) { Q_UNREACHABLE(); return false; @@ -2392,7 +2394,7 @@ void QWebEnginePage::setVisible(bool visible) } QWebEnginePage* QWebEnginePage::fromDownloadRequest(QWebEngineDownloadRequest *request) { - return static_cast<QWebEnginePagePrivate *>(request->d_ptr->m_adapterClient)->q_ptr; + return static_cast<QWebEnginePagePrivate *>(request->d_ptr->adapterClient)->q_ptr; } QDataStream &operator<<(QDataStream &stream, const QWebEngineHistory &history) |