From fac13f114653eb018590228fd6e0713e1c035d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Fri, 5 Jun 2020 13:44:34 -0300 Subject: [PATCH] AppSettings: Do not use deprecated QString enum with Qt 5.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/Settings/AppSettings.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Settings/AppSettings.cc b/src/Settings/AppSettings.cc index 7a6ffbd73..054d3c9fc 100644 --- a/src/Settings/AppSettings.cc +++ b/src/Settings/AppSettings.cc @@ -241,7 +241,13 @@ MAV_TYPE AppSettings::offlineEditingVehicleTypeFromVehicleType(MAV_TYPE vehicleT QList AppSettings::firstRunPromptsIdsVariantToList(const QVariant& firstRunPromptIds) { QList rgIds; + +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList strIdList = firstRunPromptIds.toString().split(",", QString::SkipEmptyParts); +#else + QStringList strIdList = firstRunPromptIds.toString().split(",", Qt::SkipEmptyParts); +#endif + for (const QString& strId: strIdList) { rgIds.append(strId.toInt()); } -- 2.22.0