diff --git a/src/MissionManager/MissionCommandUIInfo.cc b/src/MissionManager/MissionCommandUIInfo.cc index 2d822e2d8f74839081d065470aba9293b2a145b5..81f1b1f4ea82e1658e637b2887f22764ec71519c 100644 --- a/src/MissionManager/MissionCommandUIInfo.cc +++ b/src/MissionManager/MissionCommandUIInfo.cc @@ -384,10 +384,14 @@ bool MissionCommandUIInfo::loadJsonInfo(const QJsonObject& jsonObject, bool requ paramInfo->_label = paramObject.value(_labelJsonKey).toString(); paramInfo->_decimalPlaces = paramObject.value(_decimalPlacesJsonKey).toInt(FactMetaData::kUnknownDecimalPlaces); - paramInfo->_enumStrings = paramObject.value(_enumStringsJsonKey).toString().split(",", QString::SkipEmptyParts); paramInfo->_param = i; paramInfo->_units = paramObject.value(_unitsJsonKey).toString(); paramInfo->_nanUnchanged = paramObject.value(_nanUnchangedJsonKey).toBool(false); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + paramInfo->_enumStrings = paramObject.value(_enumStringsJsonKey).toString().split(",", QString::SkipEmptyParts); +#else + paramInfo->_enumStrings = paramObject.value(_enumStringsJsonKey).toString().split(",", Qt::SkipEmptyParts); +#endif if (paramObject.contains(_defaultJsonKey)) { if (paramInfo->_nanUnchanged) { @@ -402,8 +406,11 @@ bool MissionCommandUIInfo::loadJsonInfo(const QJsonObject& jsonObject, bool requ } else { paramInfo->_defaultValue = paramInfo->_nanUnchanged ? std::numeric_limits::quiet_NaN() : 0; } - +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList enumValues = paramObject.value(_enumValuesJsonKey).toString().split(",", QString::SkipEmptyParts); +#else + QStringList enumValues = paramObject.value(_enumValuesJsonKey).toString().split(",", Qt::SkipEmptyParts); +#endif for (const QString &enumValue: enumValues) { bool convertOk; double value = enumValue.toDouble(&convertOk);