From 028a2c8f5c12bb788a80a09812e4b68becc21ba6 Mon Sep 17 00:00:00 2001 From: con <qtc-committer@nokia.com> Date: Fri, 8 Oct 2010 12:22:53 +0200 Subject: [PATCH] File search wasn't showing non-latin1 chars correctly in results. Missing conversion back to the codec. This fixes it only for Utf8 encoded files. It was only happening for non-regexp searches. Task-number: QTCREATORBUG-65 Reviewed-by: Robert Loehning --- src/libs/utils/filesearch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 628dfdec769..39e99f8a734 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -172,7 +172,7 @@ void runFileSearch(QFutureInterface<FileSearchResultList> &future, int n = 0; while (startOfLastLine[i] != '\n' && startOfLastLine[i] != '\r' && i < textLength && n++ < 256) res.append(startOfLastLine[i++]); - results << FileSearchResult(s, lineNr, QString(res), + results << FileSearchResult(s, lineNr, QString::fromUtf8(res), regionPtr - startOfLastLine, sa.length(), QStringList()); ++numMatches; -- GitLab