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

Core: check whether the patch tool defined in settings exist

Browse Source 
Change-Id: I9b910ddfc9250b1d558bbe56c8cf82da056344ff
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
David Schulz
2017-07-27 11:14:55 +02:00
committed by Eike Ziller
parent f84d44e4e8
commit 75f1dd8b9c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/patchtool.cpp
View File

@@ -88,6 +88,12 @@ static bool runPatchHelper(const QByteArray &input, const QString &workingDirect
return false; return false;
} }
if (!Utils::FileName::fromString(patch).exists()
&& !Utils::Environment::systemEnvironment().searchInPath(patch).exists()) {
MessageManager::write(QApplication::translate("Core::PatchTool", "The patch-command configured in the general \"Environment\" settings does not exist."));
return false;
}
QProcess patchProcess; QProcess patchProcess;
if (!workingDirectory.isEmpty()) if (!workingDirectory.isEmpty())
patchProcess.setWorkingDirectory(workingDirectory); patchProcess.setWorkingDirectory(workingDirectory);