revert/fixup 309f8f4b: setFilterRegularExpression was introduced in Qt 5.12.

diff --git a/src/frontends/qt/CategorizedCombo.cpp b/src/frontends/qt/CategorizedCombo.cpp
index ac4b45068f807178075527eccd0a95660bcf6fa9..0482e1c874fe14a9e6135679166543e0e9e33fa5 100644 (file)
--- a/src/frontends/qt/CategorizedCombo.cpp
+++ b/src/frontends/qt/CategorizedCombo.cpp
@@ -287,7 +287,11 @@ void CategorizedCombo::Private::setFilter(QString const & s)
                lastSel_ = filterModel_->mapToSource(filterModel_->index(sel, 0)).row();
 
        filter_ = s;
+#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
+       filterModel_->setFilterRegExp(charFilterRegExp(filter_));
+#else
        filterModel_->setFilterRegularExpression(charFilterRegExp(filter_));
+#endif
        countCategories();
 
        // restore old selection

diff --git a/src/frontends/qt/LayoutBox.cpp b/src/frontends/qt/LayoutBox.cpp
index ab2cd7a0854f78785fe48d9f6e088270b7f4e0e1..435bd47835321ba867fbee9add160df70da94a2d 100644 (file)
--- a/src/frontends/qt/LayoutBox.cpp
+++ b/src/frontends/qt/LayoutBox.cpp
@@ -320,7 +320,11 @@ void LayoutBox::Private::setFilter(QString const & s)
                lastSel_ = filterModel_->mapToSource(filterModel_->index(sel, 0)).row();
 
        filter_ = s;
+#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
+       filterModel_->setFilterRegExp(charFilterRegExp(filter_));
+#else
        filterModel_->setFilterRegularExpression(charFilterRegExp(filter_));
+#endif
        countCategories();
 
        // restore old selection