forked from qt-creator/qt-creator
Git: Fix git.cmd not found on windows
Change-Id: I89c7743331bb28bbabe946df3da8fede44652414 Reviewed-on: http://codereview.qt-project.org/6138 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
@@ -54,11 +54,10 @@ GitSettings::GitSettings()
|
|||||||
{
|
{
|
||||||
setSettingsGroup(QLatin1String("Git"));
|
setSettingsGroup(QLatin1String("Git"));
|
||||||
|
|
||||||
|
declareKey(binaryPathKey, QLatin1String("git"));
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
declareKey(binaryPathKey, QLatin1String("git.exe"));
|
|
||||||
declareKey(timeoutKey, 60);
|
declareKey(timeoutKey, 60);
|
||||||
#else
|
#else
|
||||||
declareKey(binaryPathKey, QLatin1String("git"));
|
|
||||||
declareKey(timeoutKey, 30);
|
declareKey(timeoutKey, 30);
|
||||||
#endif
|
#endif
|
||||||
declareKey(adoptPathKey, false);
|
declareKey(adoptPathKey, false);
|
||||||
|
|||||||
Reference in New Issue
Block a user