Merge remote-tracking branch 'origin/8.0'

Change-Id: I9f41e115adb25c08acc01110b6027020eff1a1e7
This commit is contained in:
Eike Ziller
2022-06-17 11:29:14 +02:00
216 changed files with 1616 additions and 1419 deletions

View File

@@ -38,6 +38,7 @@
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/runextensions.h>
#include <utils/temporarydirectory.h>
#include <QCoreApplication>
#include <QDir>
@@ -702,10 +703,14 @@ void IosDeviceToolHandlerPrivate::requestTransferApp(const QString &bundlePath,
{
m_bundlePath = bundlePath;
m_deviceId = deviceId;
QString tmpDeltaPath = Utils::TemporaryDirectory::masterDirectoryFilePath().pathAppended("ios").toString();
QStringList args;
args << QLatin1String("--id") << deviceId << QLatin1String("--bundle")
<< bundlePath << QLatin1String("--timeout") << QString::number(timeout)
<< QLatin1String("--install");
<< QLatin1String("--install")
<< QLatin1String("--delta-path")
<< tmpDeltaPath;
start(IosToolHandler::iosDeviceToolPath(), args);
}