Merge remote-tracking branch 'origin/2.5'

This commit is contained in:
Eike Ziller
2012-03-28 16:31:29 +02:00
25 changed files with 152 additions and 57 deletions

View File

@@ -514,11 +514,13 @@ void CppFindReferences::cancel()
void CppFindReferences::openEditor(const Find::SearchResultItem &item)
{
if (item.path.size() > 0) {
TextEditor::BaseTextEditorWidget::openEditorAt(item.path.first(), item.lineNumber, item.textMarkPos,
Core::Id(),
Core::EditorManager::ModeSwitch);
TextEditor::BaseTextEditorWidget::openEditorAt(QDir::fromNativeSeparators(item.path.first()),
item.lineNumber, item.textMarkPos,
Core::Id(),
Core::EditorManager::ModeSwitch);
} else {
Core::EditorManager::instance()->openEditor(item.text, Core::Id(), Core::EditorManager::ModeSwitch);
Core::EditorManager::instance()->openEditor(QDir::fromNativeSeparators(item.text),
Core::Id(), Core::EditorManager::ModeSwitch);
}
}