Merge branch 'release/v2.0.3'

qtinuum · Dec 23, 2020 · 08b3924 · 08b3924
2 parents f017ba9 + 96f5299
commit 08b3924
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,9 @@
 QtnProperty
 ===========
 
+v2.0.3  23.12.2020
+    [FIX] Register QVariant property delegate
+
 v2.0.2  18.12.2020
     [FIX] Don't break property view splitter with drag action
 

diff --git a/QtnProperty/Delegates/PropertyDelegateFactory.cpp b/QtnProperty/Delegates/PropertyDelegateFactory.cpp
@@ -44,6 +44,7 @@ limitations under the License.
 #include "QtnProperty/PropertyInt64.h"
 #include "QtnProperty/PropertyUInt64.h"
 #include "QtnProperty/MultiProperty.h"
+#include "QtnProperty/PropertyQVariant.h"
 
 #include <QDebug>
 
@@ -252,6 +253,7 @@ void QtnPropertyDelegateFactory::registerDefaultDelegates(
 	QtnPropertyDelegateQBrushStyle::Register(factory);
 	QtnPropertyDelegateQKeySequence::Register(factory);
 	QtnPropertyDelegateQVector3D::Register(factory);
+	QtnPropertyDelegateQVariant::Register(factory);
 	QtnMultiPropertyDelegate::Register(factory);
 }
 

diff --git a/QtnProperty/QtnProperty.pro b/QtnProperty/QtnProperty.pro
@@ -2,7 +2,7 @@ include(../Internal/TargetConfig.pri)
 
 TARGET = QtnProperty
 TEMPLATE = lib
-VERSION = 2.0.2
+VERSION = 2.0.3
 
 qtnproperty_dynamic {
     DEFINES += QTN_DYNAMIC_LIBRARY