Merge remote-tracking branch 'origin/4.10'

Change-Id: Ic7144b8ae429707cd120719f3445b624c0b83564
This commit is contained in:
Eike Ziller
2019-09-25 08:30:27 +02:00
3 changed files with 77 additions and 38 deletions

View File

@@ -94,14 +94,18 @@ public:
void setSource(const QUrl &name) override;
void withFixedTopPosition(const std::function<void()> &action);
protected:
void contextMenuEvent(QContextMenuEvent *event) override;
bool eventFilter(QObject *obj, QEvent *event) override;
void mousePressEvent(QMouseEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override;
void resizeEvent(QResizeEvent *e) override;
private:
QString linkAt(const QPoint& pos);
QString linkAt(const QPoint &pos);
void scrollToTextPosition(int position);
int zoomCount;
bool forceFont;