diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-10-25 11:27:30 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-10-25 11:27:30 +0200 |
| commit | 35bb61590da4d24664e339337843194c5dab8d8d (patch) | |
| tree | 82077f9c03950afcc8cb48bbc00a751cbb190e5d /src/plugins/texteditor | |
| parent | 3b2614c6976ff1b201855893a811702376721eb9 (diff) | |
| parent | 49bb852292249e9e5801b792f9febc195e996ec5 (diff) | |
| download | qt-creator-35bb61590da4d24664e339337843194c5dab8d8d.tar.gz | |
Merge remote branch 'origin/2.1'
Conflicts:
doc/qtcreator.qdoc
share/qtcreator/templates/mobileapp/app.pro
Diffstat (limited to 'src/plugins/texteditor')
| -rw-r--r-- | src/plugins/texteditor/basefilefind.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index b34e1587bc..213627dade 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -262,7 +262,7 @@ void BaseFileFind::updateComboEntries(QComboBox *combo, bool onTop) void BaseFileFind::openEditor(const Find::SearchResultItem &item) { if (item.path.size() > 0) { - TextEditor::BaseTextEditor::openEditorAt(item.path.first(), item.lineNumber, item.textMarkPos, + TextEditor::BaseTextEditor::openEditorAt(QDir::fromNativeSeparators(item.path.first()), item.lineNumber, item.textMarkPos, QString(), Core::EditorManager::ModeSwitch); } else { Core::EditorManager::instance()->openEditor(item.text, QString(), Core::EditorManager::ModeSwitch); @@ -318,7 +318,7 @@ QStringList BaseFileFind::replaceAll(const QString &text, QHash<QString, QList<Find::SearchResultItem> > changes; foreach (const Find::SearchResultItem &item, items) - changes[item.path.first()].append(item); + changes[QDir::fromNativeSeparators(item.path.first())].append(item); Core::EditorManager *editorManager = Core::EditorManager::instance(); |