From f42faf1a22bb87561c597e9f46d4a47c8bf7fe6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Fri, 5 Jun 2020 13:43:37 -0300 Subject: [PATCH] QGroundControlQmlGlobal: 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/QmlControls/ParameterEditorController.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/QmlControls/ParameterEditorController.cc b/src/QmlControls/ParameterEditorController.cc index e28afe8..8f2cb6b 100644 --- a/src/QmlControls/ParameterEditorController.cc +++ b/src/QmlControls/ParameterEditorController.cc @@ -168,7 +168,12 @@ bool ParameterEditorController::_shouldShow(Fact* fact) void ParameterEditorController::_updateParameters(void) { QObjectList newParameterList; + +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList searchItems = _searchText.split(' ', QString::SkipEmptyParts); +#else + QStringList searchItems = _searchText.split(' ', Qt::SkipEmptyParts); +#endif if (searchItems.isEmpty() && !_showModifiedOnly) { int compId = _parameterMgr->getComponentId(_currentCategory);