From d7026dbf42151d31ecfc173793b86c7db644ea7b Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 4 Dec 2018 14:35:34 +0100
Subject: [PATCH] Ref T442, directly return image/icon types from CVariant

---
 src/blackmisc/variant.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/blackmisc/variant.cpp b/src/blackmisc/variant.cpp
index 8f5099342..c9d1b1ec4 100644
--- a/src/blackmisc/variant.cpp
+++ b/src/blackmisc/variant.cpp
@@ -9,6 +9,7 @@
 
 //! \cond PRIVATE
 
+#include "blackmisc/imageutils.h"
 #include "blackmisc/dictionary.h"
 #include "blackmisc/icon.h"
 #include "blackmisc/logmessage.h"
@@ -463,6 +464,10 @@ namespace BlackMisc
 
     QPixmap CVariant::toPixmap() const
     {
+        if (m_v.type() == QVariant::Pixmap) { return m_v.value<QPixmap>(); }
+        if (m_v.type() == QVariant::Image)  { return QPixmap::fromImage(m_v.value<QImage>()); }
+        if (m_v.type() == QVariant::Icon)   { return iconToPixmap(m_v.value<QIcon>()); }
+
         return toIcon().toPixmap();
     }