diff -rupN --no-dereference qt-creator-opensource-src-4.15.0/src/plugins/clangrefactoring/clangrefactoringplugin.cpp qt-creator-opensource-src-4.15.0-new/src/plugins/clangrefactoring/clangrefactoringplugin.cpp
--- qt-creator-opensource-src-4.15.0/src/plugins/clangrefactoring/clangrefactoringplugin.cpp 2021-05-04 04:12:55.000000000 +0200
+++ qt-creator-opensource-src-4.15.0-new/src/plugins/clangrefactoring/clangrefactoringplugin.cpp 2021-05-05 13:06:25.272356852 +0200
@@ -78,8 +78,7 @@ std::unique_ptr<ClangRefactoringPluginDa
class ClangRefactoringPluginData
{
public:
- using QuerySqliteReadStatementFactory = QuerySqliteStatementFactory<Sqlite::Database,
- Sqlite::ReadStatement>;
+ using QuerySqliteReadStatementFactory = QuerySqliteStatementFactory<Sqlite::Database>;
Sqlite::Database database{Utils::PathString{Core::ICore::cacheResourcePath()
+ "/symbol-experimental-v1.db"},
1000ms};
diff -rupN --no-dereference qt-creator-opensource-src-4.15.0/src/plugins/clangrefactoring/qtcreatorsearchhandle.cpp qt-creator-opensource-src-4.15.0-new/src/plugins/clangrefactoring/qtcreatorsearchhandle.cpp
--- qt-creator-opensource-src-4.15.0/src/plugins/clangrefactoring/qtcreatorsearchhandle.cpp 2021-05-04 04:12:55.000000000 +0200
+++ qt-creator-opensource-src-4.15.0-new/src/plugins/clangrefactoring/qtcreatorsearchhandle.cpp 2021-05-05 13:06:25.272356852 +0200
@@ -42,7 +42,11 @@ void QtCreatorSearchHandle::addResult(co
const QString &lineText,
Core::Search::TextRange textRange)
{
- searchResult->addResult(fileName, lineText, textRange);
+ Core::SearchResultItem item;
+ item.setFilePath(Utils::FilePath::fromString(fileName));
+ item.setLineText(lineText);
+ item.setMainRange(textRange);
+ searchResult->addResult(item);
}
void QtCreatorSearchHandle::setExpectedResultCount(uint count)