Commit a6596a6c authored by Eike Ziller's avatar Eike Ziller
Browse files

Fix codec that is used for project search.



The project's editor configuration is only used if it doesn't fall back
to global. In that case we need to use the global setting manually.

Change-Id: If31c06f07e80b37fc148ed118a33ed653214ef6e
Task-number: QTCREATORBUG-12693
Reviewed-by: default avatarDavid Schulz <david.schulz@theqtcompany.com>
parent 8539d31c
......@@ -101,10 +101,14 @@ Utils::FileIterator *AllProjectsFind::filesForProjects(const QStringList &nameFi
} else {
filteredFiles = projectFiles;
}
const EditorConfiguration *config = project->editorConfiguration();
QTextCodec *projectCodec = config->useGlobalSettings()
? Core::EditorManager::defaultTextCodec()
: config->textCodec();
foreach (const QString &fileName, filteredFiles) {
QTextCodec *codec = openEditorEncodings.value(fileName);
if (!codec)
codec = project->editorConfiguration()->textCodec();
codec = projectCodec;
encodings.insert(fileName, codec);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment