summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Volkov <avolkov@astralinux.ru>2020-05-26 22:20:31 +0300
committerAlexander Volkov <avolkov@astralinux.ru>2020-05-27 14:25:29 +0300
commit3c30956e65a98706d283d44e07fd481a1849f74e (patch)
tree4a9404cfd9e050f23f276cb826aec22ca0cc30ce
parentf49dedadfca3474b18478ca74ec774110768682f (diff)
Assistant: Fix build with qtwebkit
Amend b3cdd63d4bdaea09222fb93ffcd5104a2dc0bf2e. Don't declare HelpViewer::resizeEvent() when HelpViewer is inherited from QWebView to avoid linker error. Change-Id: Ib4ca6823cf17c238eb08ecc531870d66db202269 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-rw-r--r--src/assistant/assistant/helpviewer.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/assistant/assistant/helpviewer.h b/src/assistant/assistant/helpviewer.h
index fa954cc9f..acd38c66e 100644
--- a/src/assistant/assistant/helpviewer.h
+++ b/src/assistant/assistant/helpviewer.h
@@ -130,7 +130,9 @@ protected:
void wheelEvent(QWheelEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
+#if defined(BROWSER_QTEXTBROWSER)
void resizeEvent(QResizeEvent *e) override;
+#endif
private slots:
void actionChanged();