Merge branch 'release/20.08' into master

5 years ago · 055d5709c1
parent 585340cef5 08c4d4f712
commit 055d5709c1
19 changed files with 18 additions and 22 deletions
--- a/generators/chm/org.kde.okular-chm.metainfo.xml
+++ b/generators/chm/org.kde.okular-chm.metainfo.xml
@ -83,9 +83,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml
+++ b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml
@ -86,9 +86,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/djvu/org.kde.okular-djvu.metainfo.xml
+++ b/generators/djvu/org.kde.okular-djvu.metainfo.xml
@ -83,9 +83,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/dvi/org.kde.okular-dvi.metainfo.xml
+++ b/generators/dvi/org.kde.okular-dvi.metainfo.xml
@ -85,9 +85,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/epub/org.kde.okular-epub.metainfo.xml
+++ b/generators/epub/org.kde.okular-epub.metainfo.xml
@ -83,9 +83,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/fax/org.kde.okular-fax.metainfo.xml
+++ b/generators/fax/org.kde.okular-fax.metainfo.xml
@ -84,9 +84,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/fictionbook/org.kde.okular-fb.metainfo.xml
+++ b/generators/fictionbook/org.kde.okular-fb.metainfo.xml
@ -83,9 +83,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml
+++ b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml
@ -106,9 +106,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/markdown/org.kde.okular-md.metainfo.xml
+++ b/generators/markdown/org.kde.okular-md.metainfo.xml
@ -81,9 +81,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml
+++ b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml
@ -106,9 +106,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/plucker/org.kde.okular-plucker.metainfo.xml
+++ b/generators/plucker/org.kde.okular-plucker.metainfo.xml
@ -83,9 +83,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/poppler/org.kde.okular-poppler.metainfo.xml
+++ b/generators/poppler/org.kde.okular-poppler.metainfo.xml
@ -86,9 +86,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/spectre/org.kde.okular-spectre.metainfo.xml
+++ b/generators/spectre/org.kde.okular-spectre.metainfo.xml
@ -90,9 +90,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/tiff/org.kde.okular-tiff.metainfo.xml
+++ b/generators/tiff/org.kde.okular-tiff.metainfo.xml
@ -83,9 +83,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/txt/org.kde.okular-txt.metainfo.xml
+++ b/generators/txt/org.kde.okular-txt.metainfo.xml
@ -82,9 +82,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/generators/xps/org.kde.okular-xps.metainfo.xml
+++ b/generators/xps/org.kde.okular-xps.metainfo.xml
@ -83,9 +83,9 @@
  </mimetypes>
  <url type="homepage">https://okular.kde.org</url>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/mobile/app/org.kde.okular.kirigami.appdata.xml
+++ b/mobile/app/org.kde.okular.kirigami.appdata.xml
@ -274,9 +274,9 @@
    <binary>okularkirigami</binary>
  </provides>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/shell/org.kde.okular.appdata.xml
+++ b/shell/org.kde.okular.appdata.xml
@ -318,9 +318,9 @@
    <value key="KDE::forum">251</value>
  </custom>
  <releases>
+    <release version="1.11.3" date="2020-11-05"/>
    <release version="1.11.2" date="2020-10-08"/>
    <release version="1.11.1" date="2020-09-03"/>
    <release version="1.11.0" date="2020-08-13"/>
-    <release version="1.10.3" date="2020-07-09"/>
  </releases>
 </component>
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@ -2390,10 +2390,6 @@ void PageView::mouseReleaseEvent(QMouseEvent *e)
    case Okular::Settings::EnumMouseMode::Browse: {
        d->scroller->handleInput(QScroller::InputRelease, e->pos() + d->mouseGrabOffset, e->timestamp());

-        // disable flick if the cursor has wrapped around
-        if (d->mouseGrabOffset != QPoint(0, 0))
-            d->scroller->stop();
-
        // return the cursor to its normal state after dragging
        if (cursor().shape() == Qt::ClosedHandCursor)
            updateCursor(eventPos);