feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "TextEditor: Use canonical path for opened document"

Browse Source 
This reverts commit 67cfdbd224.
We cannot just resolve symlinks when opening files.
The resolved name might not have much to do with the name of
the symlink (e.g. some version control systems do that).

Change-Id: I373bfc3d4474fe6b7ef4723de254293665fe87ea
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-10-14 07:50:46 +00:00
parent 91cd7b9a33
commit 109ce6ef42
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/textdocument.cpp
View File

@@ -655,7 +655,7 @@ Core::IDocument::OpenResult TextDocument::openImpl(QString *errorString, const Q
documentLayout->lastSaveRevision = d->m_autoSaveRevision = d->m_document.revision(); documentLayout->lastSaveRevision = d->m_autoSaveRevision = d->m_document.revision();
d->updateRevisions(); d->updateRevisions();
d->m_document.setModified(fileName != realFileName); d->m_document.setModified(fileName != realFileName);
setFilePath(Utils::FileName::fromString(fi.canonicalFilePath())); setFilePath(Utils::FileName::fromUserInput(fi.absoluteFilePath()));
} }
if (readResult == Utils::TextFileFormat::ReadIOError) if (readResult == Utils::TextFileFormat::ReadIOError)
return OpenResult::ReadError; return OpenResult::ReadError;