Merge remote-tracking branch 'origin/release/19.12'

core/page.cpp

@@ -116,10 +116,12 @@ void PagePrivate::imageRotationDone( RotationJob * job )
         PixmapObject &object = it.value();
         (*object.m_pixmap) = QPixmap::fromImage( job->image() );
         object.m_rotation = job->rotation();
+        object.m_isPartialPixmap = job->isPartialUpdate();
     } else {
         PixmapObject object;
         object.m_pixmap = new QPixmap( QPixmap::fromImage( job->image() ) );
         object.m_rotation = job->rotation();
+        object.m_isPartialPixmap = job->isPartialUpdate();
 
         m_pixmaps.insert( job->observer(), object );
     }
@@ -235,6 +237,9 @@ bool Page::hasPixmap( DocumentObserver *observer, int width, int height, const N
     if ( width == -1 || height == -1 )
         return true;
 
+    if ( it.value().m_isPartialPixmap )
+        return false;
+
     const QPixmap *pixmap = it.value().m_pixmap;
 
     return (pixmap->width() == width && pixmap->height() == height);
@@ -554,6 +559,7 @@ void PagePrivate::setPixmap( DocumentObserver *observer, QPixmap *pixmap, const
         }
         it.value().m_pixmap = pixmap;
         it.value().m_rotation = m_rotation;
+        it.value().m_isPartialPixmap = isPartialPixmap;
     } else {
         // it can happen that we get a setPixmap while closing and thus the page controller is gone
         if ( m_doc->m_pageController )

core/page.h

@@ -141,8 +141,9 @@ class OKULARCORE_EXPORT Page
         void setBoundingBox( const NormalizedRect& bbox );
 
         /**
-         * Returns whether the page of size @p width x @p height has a @p pixmap 
+         * Returns whether the page of size @p width x @p height has a @p pixmap
          * in the region given by @p rect for the given @p observer
+         * If there is a partially rendered pixmap the answer is false.
          */
         bool hasPixmap( DocumentObserver *observer, int width = -1, int height = -1, const NormalizedRect &rect = NormalizedRect() ) const;
 

core/page_p.h

@@ -146,6 +146,7 @@ class PagePrivate
             public:
                 QPixmap *m_pixmap = nullptr;
                 Rotation m_rotation;
+                bool m_isPartialPixmap = false;
         };
         QMap< DocumentObserver*, PixmapObject > m_pixmaps;
         QMap< const DocumentObserver*, TilesManager *> m_tilesManagers;

generators/chm/org.kde.okular-chm.metainfo.xml

@@ -81,6 +81,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/comicbook/org.kde.okular-comicbook.metainfo.xml

@@ -84,6 +84,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/djvu/org.kde.okular-djvu.metainfo.xml

@@ -81,6 +81,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/dvi/org.kde.okular-dvi.metainfo.xml

@@ -83,6 +83,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/epub/org.kde.okular-epub.metainfo.xml

@@ -81,6 +81,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/fax/org.kde.okular-fax.metainfo.xml

@@ -82,6 +82,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/fictionbook/org.kde.okular-fb.metainfo.xml

@@ -81,6 +81,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/kimgio/org.kde.okular-kimgio.metainfo.xml

@@ -104,6 +104,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/markdown/org.kde.okular-md.metainfo.xml

@@ -79,6 +79,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml

@@ -104,6 +104,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/ooo/org.kde.okular-ooo.metainfo.xml

@@ -79,6 +79,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/plucker/org.kde.okular-plucker.metainfo.xml

@@ -81,6 +81,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/poppler/org.kde.okular-poppler.metainfo.xml

@@ -84,6 +84,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/spectre/org.kde.okular-spectre.metainfo.xml

@@ -88,6 +88,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/tiff/org.kde.okular-tiff.metainfo.xml

@@ -81,6 +81,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/txt/org.kde.okular-txt.metainfo.xml

@@ -80,6 +80,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

generators/xps/org.kde.okular-xps.metainfo.xml

@@ -81,6 +81,7 @@
   </mimetypes>
   <url type="homepage">https://okular.kde.org</url>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

mobile/app/org.kde.okular.kirigami.appdata.xml

@@ -249,6 +249,7 @@
     <binary>okularkirigami</binary>
   </provides>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>

shell/org.kde.okular.appdata.xml

@@ -299,6 +299,7 @@
     <value key="KDE::windows_store">https://www.microsoft.com/store/apps/9n41msq1wnm8</value>
   </custom>
   <releases>
+    <release version="1.9.3" date="2020-03-05"/>
     <release version="1.9.2" date="2020-02-06"/>
     <release version="1.9.1" date="2020-01-09"/>
     <release version="1.9.0" date="2019-12-12"/>