]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Port to non-deprecated QLabel::pixmap()
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Wed, 14 Oct 2020 21:46:40 +0000 (23:46 +0200)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Wed, 14 Oct 2020 23:22:00 +0000 (01:22 +0200)
Quoting from:
https://github.com/qt/qtbase/commit/714409b23ce5ec33e56adce5ba1966aad67c3b34

```
The QLabel changes to the pixmap/picture getters provide the following
migration path:

QPixmap *ppix = l->pixmap(); // up to 5.15, warns in 5.15
QPixmap pval = l->pixmap(Qt::ReturnByValue); // new in 5.15, works in 6
QPixmap pixmap = l->pixmap(); // from Qt 6 on
```

Since we can't require 5.15 yet in dolphin, the port is done only when
building with Qt >= 5.15

src/views/tooltips/dolphinfilemetadatawidget.cpp

index fdbf19ccdfb9d1554da66c0835bbfad1ca8c9eba..b147135bfdc59ced81ef960574b068bfaaa809fc 100644 (file)
@@ -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();
 }