forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/4.1'
Change-Id: If3b6ebdb2aeb6fabadea1d06a1fe1c9211adcb8e
This commit is contained in:
@@ -75,7 +75,7 @@ void GerritParameters::setPortFlagBySshType()
|
||||
const QString version = Utils::PathChooser::toolVersion(ssh, QStringList("-V"));
|
||||
isPlink = version.contains("plink", Qt::CaseInsensitive);
|
||||
}
|
||||
portFlag = isPlink ? "-P" : defaultPortFlag;
|
||||
portFlag = QLatin1String(isPlink ? "-P" : defaultPortFlag);
|
||||
}
|
||||
|
||||
GerritParameters::GerritParameters()
|
||||
|
||||
Reference in New Issue
Block a user