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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	share/share.qbs
	src/plugins/cpptools/cppchecksymbols.cpp
	src/plugins/texteditor/behaviorsettingswidget.cpp

Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
This commit is contained in:
Eike Ziller
2012-11-27 11:50:56 +01:00
parent c384f52b49 deeef5308f
commit ba1d5f2cdf
44 changed files with 276 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1274,9 +1274,13 @@ IEditor *EditorManager::openEditor(Core::Internal::EditorView *view, const QStri
qDebug() << Q_FUNC_INFO << fileName << editorId.name();
QString fn = fileName;
QFileInfo fi(fn);
int lineNumber = -1;
if (flags && EditorManager::CanContainLineNumber)
if ((flags & EditorManager::CanContainLineNumber) && !fi.exists()) {
lineNumber = extractLineNumber(&fn);
if (lineNumber != -1)
fi.setFile(fn);
}
if (fn.isEmpty())
return 0;
@@ -1287,13 +1291,12 @@ IEditor *EditorManager::openEditor(Core::Internal::EditorView *view, const QStri
const QList<IEditor *> editors = editorsForFileName(fn);
if (!editors.isEmpty()) {
IEditor *editor = editors.first();
if (flags && EditorManager::CanContainLineNumber)
if (flags & EditorManager::CanContainLineNumber)
editor->gotoLine(lineNumber, -1);
return activateEditor(view, editor, flags);
}
QString realFn = autoSaveName(fn);
QFileInfo fi(fn);
QFileInfo rfi(realFn);
if (!fi.exists() || !rfi.exists() || fi.lastModified() >= rfi.lastModified()) {
QFile::remove(realFn);
@@ -1327,7 +1330,7 @@ IEditor *EditorManager::openEditor(Core::Internal::EditorView *view, const QStri
if (editor == result)
restoreEditorState(editor);
if (flags && EditorManager::CanContainLineNumber)
if (flags & EditorManager::CanContainLineNumber)
editor->gotoLine(lineNumber, -1);
QApplication::restoreOverrideCursor();