diff options
author | hjk <hjk@qt.io> | 2019-05-15 15:49:19 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-05-17 09:26:57 +0000 |
commit | 166cb39709427085db7294c9f42a9847d9ce3a84 (patch) | |
tree | b0728976e5612a2e3833cb9596e50d25640eb892 | |
parent | c874f07d53ea8a0d4b2c0ead4b7671c2aec99eb2 (diff) | |
download | qt-creator-166cb39709427085db7294c9f42a9847d9ce3a84.tar.gz |
iOS: More FileName::appendPath -> pathAppended changes
Change-Id: I3db6b1778e6e47e26e243fb2609c481651aa91fe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r-- | src/plugins/ios/iosconfigurations.cpp | 2 | ||||
-rw-r--r-- | src/plugins/ios/iosdeploystep.cpp | 13 | ||||
-rw-r--r-- | src/plugins/ios/iosdeploystep.h | 3 | ||||
-rw-r--r-- | src/plugins/ios/iosdsymbuildstep.cpp | 4 | ||||
-rw-r--r-- | src/plugins/ios/iosrunconfiguration.cpp | 17 | ||||
-rw-r--r-- | src/plugins/ios/iosrunner.cpp | 6 | ||||
-rw-r--r-- | src/plugins/ios/iossettingswidget.cpp | 2 | ||||
-rw-r--r-- | src/plugins/ios/simulatorcontrol.cpp | 2 |
8 files changed, 21 insertions, 28 deletions
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 8ae12910e4..2354df2e87 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -214,7 +214,7 @@ static void setupKit(Kit *kit, Core::Id pDeviceType, const ToolChainPair& toolCh static QVersionNumber findXcodeVersion(const Utils::FileName &developerPath) { - FileName xcodeInfo = developerPath.parentDir().appendPath("Info.plist"); + const FileName xcodeInfo = developerPath.parentDir().pathAppended("Info.plist"); if (xcodeInfo.exists()) { QSettings settings(xcodeInfo.toString(), QSettings::NativeFormat); return QVersionNumber::fromString(settings.value("CFBundleShortVersionString").toString()); diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index ef6c44340c..e43eabb260 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -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 diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h index 56ce87fec3..ca2b64fbc5 100644 --- a/src/plugins/ios/iosdeploystep.h +++ b/src/plugins/ios/iosdeploystep.h @@ -76,7 +76,6 @@ private: IosSimulator::ConstPtr iossimulator() const; QString deviceId() const; - QString appBundle() const; void raiseError(const QString &error); void writeOutput(const QString &text, OutputFormat = OutputFormat::NormalMessage); void checkProvisioningProfile(); @@ -84,7 +83,7 @@ private: TransferStatus m_transferStatus = NoTransfer; IosToolHandler *m_toolHandler = nullptr; ProjectExplorer::IDevice::ConstPtr m_device; - QString m_bundlePath; + Utils::FileName m_bundlePath; IosDeviceType m_deviceType; static const Core::Id Id; bool m_expectFail = false; diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index f9cac49352..16a396c545 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/src/plugins/ios/iosdsymbuildstep.cpp @@ -146,8 +146,8 @@ QStringList IosDsymBuildStep::defaultCleanCmdList() const QStringList IosDsymBuildStep::defaultCmdList() const { QString dsymutilCmd = "dsymutil"; - Utils::FileName dsymUtilPath = IosConfigurations::developerPath() - .appendPath("Toolchains/XcodeDefault.xctoolchain/usr/bin/dsymutil"); + const Utils::FileName dsymUtilPath = IosConfigurations::developerPath() + .pathAppended("Toolchains/XcodeDefault.xctoolchain/usr/bin/dsymutil"); if (dsymUtilPath.exists()) dsymutilCmd = dsymUtilPath.toUserOutput(); auto runConf = qobject_cast<const IosRunConfiguration *>(target()->activeRunConfiguration()); diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 4f1ade7c42..233abbd26f 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -165,13 +165,13 @@ QString IosRunConfiguration::applicationName() const FileName IosRunConfiguration::bundleDirectory() const { - FileName res; Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit()); bool isDevice = (devType == Constants::IOS_DEVICE_TYPE); if (!isDevice && devType != Constants::IOS_SIMULATOR_TYPE) { qCWarning(iosLog) << "unexpected device type in bundleDirForTarget: " << devType.toString(); - return res; + return {}; } + FileName res; if (BuildConfiguration *bc = target()->activeBuildConfiguration()) { Project *project = target()->project(); if (ProjectNode *node = project->findNodeForBuildKey(buildKey())) @@ -182,29 +182,28 @@ FileName IosRunConfiguration::bundleDirectory() const case BuildConfiguration::Debug : case BuildConfiguration::Unknown : if (isDevice) - res.appendPath(QLatin1String("Debug-iphoneos")); + res = res.pathAppended("Debug-iphoneos"); else - res.appendPath(QLatin1String("Debug-iphonesimulator")); + res = res.pathAppended("Debug-iphonesimulator"); break; case BuildConfiguration::Profile : case BuildConfiguration::Release : if (isDevice) - res.appendPath(QLatin1String("Release-iphoneos")); + res = res.pathAppended("Release-iphoneos"); else - res.appendPath(QLatin1String("Release-iphonesimulator")); + res = res.pathAppended("Release-iphonesimulator"); break; default: qCWarning(iosLog) << "IosBuildStep had an unknown buildType " << target()->activeBuildConfiguration()->buildType(); } } - res.appendPath(applicationName() + QLatin1String(".app")); - return res; + return res.pathAppended(applicationName() + ".app"); } FileName IosRunConfiguration::localExecutable() const { - return bundleDirectory().appendPath(applicationName()); + return bundleDirectory().pathAppended(applicationName()); } void IosDeviceTypeAspect::fromMap(const QVariantMap &map) diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index 10b5f5d073..e66ce35e2e 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -449,9 +449,9 @@ void IosDebugSupport::start() if (deviceSdk1.toFileInfo().isDir()) { deviceSdk = deviceSdk1.toString(); } else { - FileName deviceSdk2 = IosConfigurations::developerPath() - .appendPath("Platforms/iPhoneOS.platform/DeviceSupport/") - .appendPath(osVersion).appendPath("Symbols"); + const FileName deviceSdk2 = IosConfigurations::developerPath() + .pathAppended("Platforms/iPhoneOS.platform/DeviceSupport/" + + osVersion + "/Symbols"); if (deviceSdk2.toFileInfo().isDir()) { deviceSdk = deviceSdk2.toString(); } else { diff --git a/src/plugins/ios/iossettingswidget.cpp b/src/plugins/ios/iossettingswidget.cpp index 4f7cd37f58..467ded471d 100644 --- a/src/plugins/ios/iossettingswidget.cpp +++ b/src/plugins/ios/iossettingswidget.cpp @@ -275,7 +275,7 @@ void IosSettingsWidget::onScreenshot() const auto generatePath = [this](const SimulatorInfo &info) { const QString fileName = QString("%1_%2_%3.png").arg(info.name).arg(info.runtimeName) .arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_HH-mm-ss-z")).replace(' ', '_'); - return m_ui->pathWidget->fileName().appendPath(fileName).toString(); + return m_ui->pathWidget->fileName().pathAppended(fileName).toString(); }; QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this); diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp index cdf2a3da6a..354c7ed230 100644 --- a/src/plugins/ios/simulatorcontrol.cpp +++ b/src/plugins/ios/simulatorcontrol.cpp @@ -96,7 +96,7 @@ static bool runSimCtlCommand(QStringList args, QString *output) static bool launchSimulator(const QString &simUdid) { QTC_ASSERT(!simUdid.isEmpty(), return false); const QString simulatorAppPath = IosConfigurations::developerPath() - .appendPath("Applications/Simulator.app/Contents/MacOS/Simulator").toString(); + .pathAppended("Applications/Simulator.app/Contents/MacOS/Simulator").toString(); if (IosConfigurations::xcodeVersion() >= QVersionNumber(9)) { // For XCode 9 boot the second device instead of launching simulator app twice. |