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

Fix build

Browse Source 
The (un)expectDirectoryChange API addition has been reverted

Change-Id: I4736f51a77eb2f63b3e4a7b44426ad15a06624c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2013-06-19 11:45:05 +02:00
committed by Orgad Shaneh
parent 1ef2e51cf8
commit f7349e49df
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/mergetool.cpp
View File

@@ -102,7 +102,6 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
if (m_process->waitForStarted()) {
connect(m_process, SIGNAL(finished(int)), this, SLOT(done()));
connect(m_process, SIGNAL(readyRead()), this, SLOT(readData()));
Core::DocumentManager::expectDirectoryChange(workingDirectory);
}
else {
delete m_process;
@@ -269,7 +268,6 @@ void MergeTool::done()
} else {
outputWindow->append(tr("Merge tool process terminated with exit code %1").arg(exitCode));
}
Core::DocumentManager::unexpectDirectoryChange(workingDirectory);
GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(workingDirectory);
deleteLater();
}