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

iOS: More FileName::appendPath -> pathAppended changes

Browse Source 
Change-Id: I3db6b1778e6e47e26e243fb2609c481651aa91fe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-05-15 15:49:19 +02:00
parent c874f07d53
commit 166cb39709
8 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/ios/iosdeploystep.cpp
View File

@@ -50,6 +50,7 @@
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
using namespace ProjectExplorer;
using namespace Utils;
namespace Ios {
namespace Internal {
@@ -86,7 +87,7 @@ bool IosDeployStep::init()
auto runConfig = qobject_cast<const IosRunConfiguration *>(
this->target()->activeRunConfiguration());
QTC_ASSERT(runConfig, return false);
m_bundlePath = runConfig->bundleDirectory().toString();
m_bundlePath = runConfig->bundleDirectory();
if (iosdevice()) {
m_deviceType = IosDeviceType(IosDeviceType::IosDevice, deviceId());
@@ -122,7 +123,7 @@ void IosDeployStep::doRun()
connect(m_toolHandler, &IosToolHandler::errorMsg,
this, &IosDeployStep::handleErrorMsg);
checkProvisioningProfile();
m_toolHandler->requestTransferApp(appBundle(), m_deviceType.identifier);
m_toolHandler->requestTransferApp(m_bundlePath.toString(), m_deviceType.identifier);
}
void IosDeployStep::doCancel()
@@ -227,11 +228,6 @@ QString IosDeployStep::deviceId() const
return iosdevice()->uniqueDeviceID();
}
QString IosDeployStep::appBundle() const
{
return m_bundlePath;
}
void IosDeployStep::raiseError(const QString &errorString)
{
emit addTask(Task(Task::Error, errorString, Utils::FileName::fromString(QString()), -1,
@@ -249,8 +245,7 @@ void IosDeployStep::checkProvisioningProfile()
if (device.isNull())
return;
Utils::FileName provisioningFilePath = Utils::FileName::fromString(appBundle());
provisioningFilePath.appendPath(QLatin1String("embedded.mobileprovision"));
const FileName provisioningFilePath = m_bundlePath.pathAppended("embedded.mobileprovision");
// the file is a signed plist stored in DER format
// we simply search for start and end of the plist instead of decoding the DER payload