diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-10-07 17:38:05 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-10-07 17:44:32 +0300 |
commit | 183d0101f41fd5a1007708a9416d1f12db31c1cb (patch) | |
tree | 969a5e91aef3b4c6805331e56c24fa6be8738f6b /src/pdfwidgets | |
parent | 17e9f29577ea6573c7c348083ff510ee60c7e8cc (diff) | |
parent | 13381ca9e80578d038835c8a4dc609d75dfdec4c (diff) |
Merge tag 'v6.2.10-lts' into tqtc/lts-6.2-opensourcev6.2.10-lts-lgpl6.2.10
Qt 6.2.10-lts release
Conflicts solved:
CHROMIUM_VERSION
dependencies.yaml
src/core/web_engine_context.cpp
Change-Id: Ia54316ba0df3488d8e13c8f14fead1d90099519b
Diffstat (limited to 'src/pdfwidgets')
-rw-r--r-- | src/pdfwidgets/qpdfview.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/pdfwidgets/qpdfview.cpp b/src/pdfwidgets/qpdfview.cpp index 831b51515..6e65639f0 100644 --- a/src/pdfwidgets/qpdfview.cpp +++ b/src/pdfwidgets/qpdfview.cpp @@ -14,7 +14,6 @@ #include <QPdfPageNavigator> #include <QScreen> #include <QScrollBar> -#include <QScroller> QT_BEGIN_NAMESPACE @@ -281,8 +280,6 @@ QPdfView::QPdfView(QWidget *parent) verticalScrollBar()->setSingleStep(20); horizontalScrollBar()->setSingleStep(20); - QScroller::grabGesture(this); - d->calculateViewport(); } |