1 files changed, 28 insertions, 0 deletions
diff --git a/src/lib/corelib/tools/qttools.h b/src/lib/corelib/tools/qttools.h
index 2d4a38544..bbec32544 100644
--- a/src/lib/corelib/tools/qttools.h
+++ b/src/lib/corelib/tools/qttools.h
@@ -43,6 +43,7 @@
 #include <QtCore/qhash.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qtextstream.h>
+#include <QtCore/qvariant.h>
 
 #include <functional>
 
@@ -118,6 +119,33 @@ QHash<K, V> &unite(QHash<K, V> &h, const QHash<K, V> &other)
 #endif
 }
 
+inline void setupDefaultCodec(QTextStream &stream)
+{
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+    stream.setCodec("UTF-8");
+#else
+    Q_UNUSED(stream);
+#endif
+}
+
+inline bool qVariantCanConvert(const QVariant &variant, int typeId)
+{
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    return variant.canConvert(QMetaType(typeId));
+#else
+    return variant.canConvert(typeId); // deprecated in Qt6
+#endif
+}
+
+inline bool qVariantConvert(QVariant &variant, int typeId)
+{
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    return variant.convert(QMetaType(typeId));
+#else
+    return variant.convert(typeId); // deprecated in Qt6
+#endif
+}
+
 } // namespace qbs
 
 #endif // QBSQTTOOLS_H