Fix QLabel::pixmap returns a value not a pointer on qt 6

qgis · Jul 27, 2021 · 83749c1 · 83749c1
1 parent 581cb40
commit 83749c1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/gui/qgsexternalresourcewidget.cpp b/src/gui/qgsexternalresourcewidget.cpp
@@ -142,9 +142,13 @@ void QgsExternalResourceWidget::updateDocumentViewer()
 
   if ( mDocumentViewerContent == Image )
   {
-    const QPixmap *pm = mPixmapLabel->pixmap();
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    const QPixmap pm = mPixmapLabel->pixmap() ? *mPixmapLabel->pixmap() : QPixmap();
+#else
+    const QPixmap pm = mPixmapLabel->pixmap();
+#endif
 
-    if ( !pm || pm->isNull() )
+    if ( !pm || pm.isNull() )
     {
       mPixmapLabel->setMinimumSize( QSize( 0, 0 ) );
     }
@@ -153,11 +157,11 @@ void QgsExternalResourceWidget::updateDocumentViewer()
       QSize size( mDocumentViewerWidth, mDocumentViewerHeight );
       if ( size.width() == 0 && size.height() > 0 )
       {
-        size.setWidth( size.height() * pm->size().width() / pm->size().height() );
+        size.setWidth( size.height() * pm.size().width() / pm.size().height() );
       }
       else if ( size.width() > 0 && size.height() == 0 )
       {
-        size.setHeight( size.width() * pm->size().height() / pm->size().width() );
+        size.setHeight( size.width() * pm.size().height() / pm.size().width() );
       }
 
       if ( size.width() != 0 || size.height() != 0 )