Removed assert from QxFactoryX::registerFactory. Fixed some compiler …

…warnings when building against Qt6.
PepaRokos · Apr 7, 2023 · 975c3b5 · 975c3b5
1 parent 0d837dd
commit 975c3b5
Show file tree

Hide file tree

Showing 5 changed files with 126 additions and 124 deletions.
diff --git a/include/QxConvert/QxConvert_Impl.h b/include/QxConvert/QxConvert_Impl.h
@@ -119,7 +119,7 @@ struct QxConvertHelper_Persistable { };
 struct QxConvertHelper_Container { };
 struct QxConvertHelper_Enum { };
 
-inline bool checkConvertQVariantToString(const QVariant & v) { return ((v.type() == QVariant::List) || (v.type() == QVariant::Map) || (v.type() == QVariant::Hash) || (v.type() == QVariant::StringList)); }
+inline bool checkConvertQVariantToString(const QVariant & v) { return ((v.typeId() == QMetaType::QVariantList) || (v.typeId() == QMetaType::QVariantMap) || (v.typeId() == QMetaType::QVariantHash) || (v.typeId() == QMetaType::QStringList)); }
 
 } // namespace helper