X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/67ebd66f94356b4e66005b1072919cb7b5e858bb..3bf471e0:/src/views/tooltips/dolphinfilemetadatawidget.cpp

diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp
index fdbf19ccd..e914593fb 100644
--- a/src/views/tooltips/dolphinfilemetadatawidget.cpp
+++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp
@@ -66,7 +66,7 @@ DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
 
     QHBoxLayout* layout = new QHBoxLayout(this);
     layout->addWidget(m_preview);
-    layout->addSpacing(layout->margin());
+    layout->addSpacing(layout->contentsMargins().left());
     layout->addLayout(textLayout);
 }
 
@@ -81,9 +81,16 @@ void DolphinFileMetaDataWidget::setPreview(const QPixmap& pixmap)
 
 QPixmap DolphinFileMetaDataWidget::preview() const
 {
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
     if (m_preview->pixmap()) {
         return *m_preview->pixmap();
     }
+#else
+    if (!m_preview->pixmap(Qt::ReturnByValue).isNull()) {
+        return m_preview->pixmap(Qt::ReturnByValue);
+    }
+#endif
+
     return QPixmap();
 }