From 8ef8e03e212ba4e51060a019ea0ac304c9a568a2 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sun, 4 Jul 2021 22:15:17 +0200 Subject: [PATCH] Fix regex porting regression QAbstractItemModel::match() under the hood uses QRegExp::exactMatch(), so with QRegularExpression we need to use anchoredPattern() on the pattern. Regression spotted by a failing dolphinmainwindowtest. --- src/dolphinviewcontainer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index b92e8b6ef..dc7cacff4 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -476,7 +476,8 @@ QString DolphinViewContainer::caption() const } KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel(); - const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, QUrl(url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?")), 1, Qt::MatchRegularExpression); + const QString pattern = url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?"); + const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, QRegularExpression::anchoredPattern(pattern), 1, Qt::MatchRegularExpression); if (!matchedPlaces.isEmpty()) { return placesModel->text(matchedPlaces.first());