diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2021-03-19 17:11:09 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2021-03-26 11:03:03 +0100 |
| commit | 7d38268b4a06d0d598b14de7bc4d9fcc58988614 (patch) | |
| tree | 4712e96eead2e28c818d0adfc2a687630f5fcfce /src | |
| parent | 5e554226d00839011f6d131f75955d939f01a0b4 (diff) | |
| download | qtivi-7d38268b4a06d0d598b14de7bc4d9fcc58988614.tar.gz | |
Fix failing autotests
Fix the CMakeLists.txt of servicemanagertest to also link the static_plugins.
Fix the qiviqmlconversion_helper to not convert strings to char arrays.
Adapt servicemanager autotest to ignore some features which doesn't work
yet with cmake.
Change-Id: I5b0ff928003858a304a8dc97978a33abf685883d
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ivicore/qiviqmlconversion_helper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ivicore/qiviqmlconversion_helper.cpp b/src/ivicore/qiviqmlconversion_helper.cpp index 4ad719f..82914c4 100644 --- a/src/ivicore/qiviqmlconversion_helper.cpp +++ b/src/ivicore/qiviqmlconversion_helper.cpp @@ -102,7 +102,7 @@ QVariant qtivi_convertFromJSON(const QVariant &value) // This is needed as it could also store a QStringList or a Hash if (val.canConvert(QMetaType::fromType<QVariantMap>())) val.convert(QMetaType::fromType<QVariantMap>()); - if (val.canConvert(QMetaType::fromType<QVariantList>())) + if (val.metaType() != QMetaType::fromType<QString>() && val.canConvert(QMetaType::fromType<QVariantList>())) val.convert(QMetaType::fromType<QVariantList>()); if (val.metaType() == QMetaType::fromType<QVariantMap>()) { |