forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/8.0'
Change-Id: I3f218b52bf6904daca3779fb677e51f6f51f2f9f
This commit is contained in:
@@ -238,7 +238,7 @@ static QByteArray decodeProvisioningProfile(const QString &path)
|
||||
p.runBlocking();
|
||||
if (p.result() != ProcessResult::FinishedWithSuccess)
|
||||
qCDebug(iosCommonLog) << "Reading signed provisioning file failed" << path;
|
||||
return p.stdOut().toLatin1();
|
||||
return p.cleanedStdOut().toLatin1();
|
||||
}
|
||||
|
||||
void IosConfigurations::updateAutomaticKitList()
|
||||
|
||||
@@ -72,7 +72,7 @@ void XcodeProbe::detectDeveloperPaths()
|
||||
qCWarning(probeLog)
|
||||
<< QString::fromLatin1("Could not detect selected Xcode using xcode-select");
|
||||
else
|
||||
addDeveloperPath(selectedXcode.stdOut().trimmed());
|
||||
addDeveloperPath(selectedXcode.cleanedStdOut().trimmed());
|
||||
addDeveloperPath(defaultDeveloperPath);
|
||||
}
|
||||
|
||||
|
||||
@@ -85,7 +85,7 @@ static bool runCommand(const CommandLine &command, QString *stdOutput, QString *
|
||||
p.setCommand(command);
|
||||
p.runBlocking();
|
||||
if (stdOutput)
|
||||
*stdOutput = p.stdOut();
|
||||
*stdOutput = p.cleanedStdOut();
|
||||
if (allOutput)
|
||||
*allOutput = p.allOutput();
|
||||
return p.result() == ProcessResult::FinishedWithSuccess;
|
||||
|
||||
Reference in New Issue
Block a user