From 4c2351e3ef2c73189066198b6b3bebe93c146240 Mon Sep 17 00:00:00 2001 From: silverqx Date: Tue, 18 Jan 2022 10:17:09 +0100 Subject: [PATCH] fixed missing QVariant::typeid() for Qt6 --- src/orm/support/configurationoptionsparser.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/orm/support/configurationoptionsparser.cpp b/src/orm/support/configurationoptionsparser.cpp index 4d13d94c4..1f25ddfc7 100644 --- a/src/orm/support/configurationoptionsparser.cpp +++ b/src/orm/support/configurationoptionsparser.cpp @@ -60,9 +60,12 @@ ConfigurationOptionsParser::validateConfigOptions(const QVariant &options) const QVariantHash ConfigurationOptionsParser::prepareConfigOptions(const QVariant &options) const { - // CUR verify, I have qt5/6 macros across whole app for this silverqx // Input is already validated, so I can be sure that options key is QVariantHash +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + if (options.typeId() != QMetaType::QString) +#else if (options.userType() != QMetaType::QString) +#endif return options.value(); // Convert to the QVariantHash