From 69d66a121dba0fd70e19dc12219297fa2a9e6bc6 Mon Sep 17 00:00:00 2001
From: Alessandro Pasotti <elpaso@itopen.it>
Date: Tue, 22 Sep 2020 11:26:59 +0200
Subject: [PATCH] Check field subType for a fallback icon

---
 src/core/qgsdataitem.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
index b8ac5e24fe9..0f5f24f1e4e 100644
--- a/src/core/qgsdataitem.cpp
+++ b/src/core/qgsdataitem.cpp
@@ -227,7 +227,13 @@ QgsFieldItem::~QgsFieldItem()
 
 QIcon QgsFieldItem::icon()
 {
-  return QgsFields::iconForFieldType( mField.type() );
+  const QIcon icon { QgsFields::iconForFieldType( mField.type() ) };
+  // Try subtype if icon is null
+  if ( icon.isNull() )
+  {
+    return QgsFields::iconForFieldType( mField.subType() );
+  }
+  return icon;
 }
 
 QIcon QgsFavoritesItem::iconFavorites()