diff options
Diffstat (limited to 'src/plugins/ios/iosrunconfiguration.cpp')
| -rw-r--r-- | src/plugins/ios/iosrunconfiguration.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index c96169711a..05f30251fc 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -46,6 +46,8 @@ #include <qtsupport/qtoutputformatter.h> #include <qtsupport/qtkitinformation.h> +#include <utils/fileutils.h> + #include <QList> #include <QStandardItemModel> @@ -130,7 +132,7 @@ void IosRunConfiguration::deviceChanges() { enabledCheck(); } -void IosRunConfiguration::proFileUpdated(QmakeProjectManager::QmakeProFileNode *pro, bool success, +void IosRunConfiguration::proFileUpdated(QmakeProFileNode *pro, bool success, bool parseInProgress) { if (m_profilePath != pro->path()) @@ -149,7 +151,7 @@ QWidget *IosRunConfiguration::createConfigurationWidget() return new IosRunConfigurationWidget(this); } -Utils::OutputFormatter *IosRunConfiguration::createOutputFormatter() const +OutputFormatter *IosRunConfiguration::createOutputFormatter() const { return new QtSupport::QtOutputFormatter(target()->project()); } @@ -209,9 +211,9 @@ QString IosRunConfiguration::applicationName() const return QString(); } -Utils::FileName IosRunConfiguration::bundleDirectory() const +FileName IosRunConfiguration::bundleDirectory() const { - Utils::FileName res; + FileName res; Core::Id devType = DeviceTypeKitInformation::deviceTypeId(target()->kit()); bool isDevice = (devType == Constants::IOS_DEVICE_TYPE); if (!isDevice && devType != Constants::IOS_SIMULATOR_TYPE) { @@ -257,7 +259,7 @@ Utils::FileName IosRunConfiguration::bundleDirectory() const return res; } -Utils::FileName IosRunConfiguration::localExecutable() const +FileName IosRunConfiguration::localExecutable() const { return bundleDirectory().appendPath(applicationName()); } @@ -301,7 +303,7 @@ QString IosRunConfiguration::disabledReason() const { if (m_parseInProgress) return tr("The .pro file \"%1\" is currently being parsed.") - .arg(QFileInfo(m_profilePath).fileName()); + .arg(FileName::fromString(m_profilePath).fileName()); if (!m_parseSuccess) return static_cast<QmakeProject *>(target()->project()) ->disabledReasonForRunConfiguration(m_profilePath); @@ -403,7 +405,7 @@ IosRunConfigurationWidget::~IosRunConfigurationWidget() QString IosRunConfigurationWidget::argListToString(const QStringList &args) const { - return Utils::QtcProcess::joinArgs(args); + return QtcProcess::joinArgs(args); } QStringList IosRunConfigurationWidget::stringToArgList(const QString &args) const |