aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects/KvsObject_sql.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/objects/KvsObject_sql.cpp')
-rw-r--r--src/modules/objects/KvsObject_sql.cpp19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index a4c036546..361f28cc1 100644
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -212,9 +212,13 @@ KVSO_CLASS_FUNCTION(sql, queryLastInsertId)
{
CHECK_QUERY_IS_INIT
QVariant value = m_pCurrentSQlQuery->lastInsertId();
- if(value.type() == QVariant::LongLong)
+#if(QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+ uint vType = value.type();
+#else
+ uint vType = value.typeId();
+#endif
+ if(vType == QMetaType::LongLong)
c->returnValue()->setInteger((kvs_int_t)value.toLongLong());
- qDebug("type %i", value.type());
return true;
}
KVSO_CLASS_FUNCTION(sql, features)
@@ -467,11 +471,16 @@ KVSO_CLASS_FUNCTION(sql, queryRecord)
{
KviKvsVariant * pValue = nullptr;
QVariant value = record.value(i);
- if(value.type() == QVariant::LongLong)
+#if(QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+ uint vType = value.type();
+#else
+ uint vType = value.typeId();
+#endif
+ if(vType == QMetaType::LongLong)
pValue = new KviKvsVariant((kvs_int_t)value.toLongLong());
- else if(value.type() == QVariant::String)
+ else if(vType == QMetaType::QString)
pValue = new KviKvsVariant(value.toString());
- else if(value.type() == QVariant::ByteArray)
+ else if(vType == QMetaType::QByteArray)
{
KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("memoryBuffer");
KviKvsVariantList params(new KviKvsVariant(QString()));