summaryrefslogtreecommitdiff
path: root/src/plugins/ios
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/ios')
-rw-r--r--src/plugins/ios/iosbuildstep.cpp73
-rw-r--r--src/plugins/ios/iosbuildstep.h41
-rw-r--r--src/plugins/ios/iosconfigurations.cpp4
-rw-r--r--src/plugins/ios/iosconfigurations.h2
-rw-r--r--src/plugins/ios/iosdeploystep.cpp99
-rw-r--r--src/plugins/ios/iosdeploystep.h51
-rw-r--r--src/plugins/ios/iosdsymbuildstep.cpp27
-rw-r--r--src/plugins/ios/iosdsymbuildstep.h1
-rw-r--r--src/plugins/ios/iosplugin.cpp15
-rw-r--r--src/plugins/ios/iosqtversion.cpp6
-rw-r--r--src/plugins/ios/iosqtversion.h2
-rw-r--r--src/plugins/ios/iosrunconfiguration.cpp2
-rw-r--r--src/plugins/ios/iossettingswidget.cpp6
-rw-r--r--src/plugins/ios/iossettingswidget.h1
14 files changed, 146 insertions, 184 deletions
diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index c881e62267..9fbe292299 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -38,6 +38,7 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/gcctoolchain.h>
+#include <projectexplorer/abstractprocessstep.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtparser.h>
@@ -61,18 +62,42 @@ namespace Ios {
namespace Internal {
const char IOS_BUILD_STEP_ID[] = "Ios.IosBuildStep";
-const char IOS_BUILD_STEP_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Ios::Internal::IosBuildStep",
- "xcodebuild");
-
const char BUILD_USE_DEFAULT_ARGS_KEY[] = "Ios.IosBuildStep.XcodeArgumentsUseDefault";
const char BUILD_ARGUMENTS_KEY[] = "Ios.IosBuildStep.XcodeArguments";
const char CLEAN_KEY[] = "Ios.IosBuildStep.Clean";
+class IosBuildStep final : public AbstractProcessStep
+{
+ Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosBuildStep)
+
+public:
+ IosBuildStep(BuildStepList *parent, Core::Id id);
+
+ BuildStepConfigWidget *createConfigWidget() final;
+ void setBaseArguments(const QStringList &args);
+ void setExtraArguments(const QStringList &extraArgs);
+ QStringList baseArguments() const;
+ QStringList allArguments() const;
+ QStringList defaultArguments() const;
+ Utils::FilePath buildCommand() const;
+
+ bool init() final;
+ void setupOutputFormatter(Utils::OutputFormatter *formatter);
+ void doRun() final;
+ bool fromMap(const QVariantMap &map) final;
+ QVariantMap toMap() const final;
+
+ QStringList m_baseBuildArguments;
+ QStringList m_extraArguments;
+ bool m_useDefaultArguments = true;
+ bool m_clean = false;
+};
+
//
// IosBuildStepConfigWidget
//
-class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
+class IosBuildStepConfigWidget final : public BuildStepConfigWidget
{
public:
IosBuildStepConfigWidget(IosBuildStep *buildStep)
@@ -145,12 +170,10 @@ private:
void updateDetails()
{
- BuildConfiguration *bc = m_buildStep->buildConfiguration();
-
ProcessParameters param;
- param.setMacroExpander(bc->macroExpander());
- param.setWorkingDirectory(bc->buildDirectory());
- param.setEnvironment(bc->environment());
+ param.setMacroExpander(m_buildStep->macroExpander());
+ param.setWorkingDirectory(m_buildStep->buildDirectory());
+ param.setEnvironment(m_buildStep->buildEnvironment());
param.setCommandLine({m_buildStep->buildCommand(), m_buildStep->allArguments()});
setSummaryText(param.summary(displayName()));
@@ -166,8 +189,8 @@ private:
IosBuildStep::IosBuildStep(BuildStepList *parent, Id id)
: AbstractProcessStep(parent, id)
{
- setDefaultDisplayName(QCoreApplication::translate("GenericProjectManager::Internal::IosBuildStep",
- IOS_BUILD_STEP_DISPLAY_NAME));
+ setDefaultDisplayName(tr("xcodebuild"));
+
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
m_clean = true;
setExtraArguments(QStringList("clean"));
@@ -177,10 +200,8 @@ IosBuildStep::IosBuildStep(BuildStepList *parent, Id id)
bool IosBuildStep::init()
{
BuildConfiguration *bc = buildConfiguration();
- if (!bc)
- emit addTask(Task::buildConfigurationMissingTask());
- ToolChain *tc = ToolChainKitAspect::toolChain(target()->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID);
+ ToolChain *tc = ToolChainKitAspect::cxxToolChain(target()->kit());
if (!tc)
emit addTask(Task::compilerMissingTask());
@@ -202,15 +223,17 @@ bool IosBuildStep::init()
// That is mostly so that rebuild works on an already clean project
setIgnoreReturnValue(m_clean);
- setOutputParser(new GnuMakeParser());
- IOutputParser *parser = target()->kit()->createOutputParser();
- if (parser)
- appendOutputParser(parser);
- outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
-
return AbstractProcessStep::init();
}
+void IosBuildStep::setupOutputFormatter(OutputFormatter *formatter)
+{
+ formatter->addLineParser(new GnuMakeParser);
+ formatter->addLineParsers(target()->kit()->createOutputParsers());
+ formatter->addSearchDir(processParameters()->effectiveWorkingDirectory());
+ AbstractProcessStep::setupOutputFormatter(formatter);
+}
+
QVariantMap IosBuildStep::toMap() const
{
QVariantMap map(AbstractProcessStep::toMap());
@@ -240,7 +263,7 @@ QStringList IosBuildStep::defaultArguments() const
{
QStringList res;
Kit *kit = target()->kit();
- ToolChain *tc = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID);
+ ToolChain *tc = ToolChainKitAspect::cxxToolChain(kit);
switch (buildConfiguration()->buildType()) {
case BuildConfiguration::Debug :
res << "-configuration" << "Debug";
@@ -252,8 +275,7 @@ QStringList IosBuildStep::defaultArguments() const
case BuildConfiguration::Unknown :
break;
default:
- qCWarning(iosLog) << "IosBuildStep had an unknown buildType "
- << buildConfiguration()->buildType();
+ qCWarning(iosLog) << "IosBuildStep had an unknown buildType " << buildType();
}
if (tc->typeId() == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID
|| tc->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID) {
@@ -262,7 +284,7 @@ QStringList IosBuildStep::defaultArguments() const
}
if (!SysRootKitAspect::sysRoot(kit).isEmpty())
res << "-sdk" << SysRootKitAspect::sysRoot(kit).toString();
- res << "SYMROOT=" + buildConfiguration()->buildDirectory().toString();
+ res << "SYMROOT=" + buildDirectory().toString();
return res;
}
@@ -310,8 +332,7 @@ IosBuildStepFactory::IosBuildStepFactory()
Constants::IOS_SIMULATOR_TYPE});
setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_CLEAN,
ProjectExplorer::Constants::BUILDSTEPS_BUILD});
- setDisplayName(QCoreApplication::translate("GenericProjectManager::Internal::IosBuildStep",
- IOS_BUILD_STEP_DISPLAY_NAME));
+ setDisplayName(IosBuildStep::tr("xcodebuild"));
}
} // namespace Internal
diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h
index 3f6145202c..3a27b20960 100644
--- a/src/plugins/ios/iosbuildstep.h
+++ b/src/plugins/ios/iosbuildstep.h
@@ -25,49 +25,12 @@
#pragma once
-#include <projectexplorer/abstractprocessstep.h>
-
-QT_BEGIN_NAMESPACE
-class QListWidgetItem;
-QT_END_NAMESPACE
+#include <projectexplorer/buildstep.h>
namespace Ios {
namespace Internal {
-class IosBuildStepConfigWidget;
-class IosBuildStepFactory;
-
-class IosBuildStep : public ProjectExplorer::AbstractProcessStep
-{
- Q_OBJECT
-
- friend class IosBuildStepConfigWidget;
- friend class IosBuildStepFactory;
-
-public:
- IosBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
-
- ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
- void setBaseArguments(const QStringList &args);
- void setExtraArguments(const QStringList &extraArgs);
- QStringList baseArguments() const;
- QStringList allArguments() const;
- QStringList defaultArguments() const;
- Utils::FilePath buildCommand() const;
-
-private:
- bool init() override;
- void doRun() override;
- bool fromMap(const QVariantMap &map) override;
- QVariantMap toMap() const override;
-
- QStringList m_baseBuildArguments;
- QStringList m_extraArguments;
- bool m_useDefaultArguments = true;
- bool m_clean = false;
-};
-
-class IosBuildStepFactory : public ProjectExplorer::BuildStepFactory
+class IosBuildStepFactory final : public ProjectExplorer::BuildStepFactory
{
public:
IosBuildStepFactory();
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index 158805c53d..b90787ff63 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -288,8 +288,8 @@ void IosConfigurations::updateAutomaticKitList()
// we do not compare the sdk (thus automatically upgrading it in place if a
// new Xcode is used). Change?
return DeviceTypeKitAspect::deviceTypeId(kit) == pDeviceType
- && ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID) == platformToolchains.second
- && ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::C_LANGUAGE_ID) == platformToolchains.first
+ && ToolChainKitAspect::cxxToolChain(kit) == platformToolchains.second
+ && ToolChainKitAspect::cToolChain(kit) == platformToolchains.first
&& QtKitAspect::qtVersion(kit) == qtVersion;
});
QTC_ASSERT(!resultingKits.contains(kit), continue);
diff --git a/src/plugins/ios/iosconfigurations.h b/src/plugins/ios/iosconfigurations.h
index cddf0a5806..d041ac3f21 100644
--- a/src/plugins/ios/iosconfigurations.h
+++ b/src/plugins/ios/iosconfigurations.h
@@ -95,8 +95,6 @@ using DevelopmentTeams = QList<DevelopmentTeamPtr>;
class IosToolChainFactory : public ProjectExplorer::ToolChainFactory
{
- Q_OBJECT
-
public:
IosToolChainFactory();
diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index 329fab7bfd..7bd5a87944 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -24,13 +24,15 @@
****************************************************************************/
#include "iosdeploystep.h"
+
#include "iosbuildstep.h"
+#include "iosconfigurations.h"
#include "iosconstants.h"
+#include "iosdevice.h"
#include "iosrunconfiguration.h"
+#include "iossimulator.h"
#include "iostoolhandler.h"
-#include <coreplugin/messagemanager.h>
-
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
@@ -39,22 +41,64 @@
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/devicesupport/devicemanager.h>
-#include <qtsupport/qtkitinformation.h>
-
#include <utils/temporaryfile.h>
#include <QDir>
#include <QFile>
#include <QSettings>
-#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
-
using namespace ProjectExplorer;
using namespace Utils;
namespace Ios {
namespace Internal {
+class IosDeployStep final : public BuildStep
+{
+ Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosDeployStep)
+
+public:
+ enum TransferStatus {
+ NoTransfer,
+ TransferInProgress,
+ TransferOk,
+ TransferFailed
+ };
+
+ IosDeployStep(BuildStepList *bc, Core::Id id);
+
+private:
+ void cleanup();
+
+ void doRun() final;
+ void doCancel() final;
+
+ void handleIsTransferringApp(IosToolHandler *handler, const QString &bundlePath,
+ const QString &deviceId, int progress, int maxProgress,
+ const QString &info);
+ void handleDidTransferApp(IosToolHandler *handler, const QString &bundlePath, const QString &deviceId,
+ IosToolHandler::OpStatus status);
+ void handleFinished(IosToolHandler *handler);
+ void handleErrorMsg(IosToolHandler *handler, const QString &msg);
+ void updateDisplayNames();
+
+ bool init() final;
+ BuildStepConfigWidget *createConfigWidget() final;
+ IDevice::ConstPtr device() const;
+ IosDevice::ConstPtr iosdevice() const;
+ IosSimulator::ConstPtr iossimulator() const;
+
+ QString deviceId() const;
+ void checkProvisioningProfile();
+
+ TransferStatus m_transferStatus = NoTransfer;
+ IosToolHandler *m_toolHandler = nullptr;
+ IDevice::ConstPtr m_device;
+ FilePath m_bundlePath;
+ IosDeviceType m_deviceType;
+ bool m_expectFail = false;
+};
+
IosDeployStep::IosDeployStep(BuildStepList *parent, Core::Id id)
: BuildStep(parent, id)
{
@@ -66,15 +110,9 @@ IosDeployStep::IosDeployStep(BuildStepList *parent, Core::Id id)
this, &IosDeployStep::updateDisplayNames);
}
-Core::Id IosDeployStep::stepId()
-{
- return "Qt4ProjectManager.IosDeployStep";
-}
-
void IosDeployStep::updateDisplayNames()
{
- IDevice::ConstPtr dev =
- DeviceKitAspect::device(target()->kit());
+ IDevice::ConstPtr dev = DeviceKitAspect::device(target()->kit());
const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName();
setDefaultDisplayName(tr("Deploy to %1").arg(devName));
setDisplayName(tr("Deploy to %1").arg(devName));
@@ -95,7 +133,7 @@ bool IosDeployStep::init()
m_deviceType = runConfig->deviceType();
} else {
emit addOutput(tr("Error: no device available, deploy failed."),
- BuildStep::OutputFormat::ErrorMessage);
+ OutputFormat::ErrorMessage);
return false;
}
return true;
@@ -104,7 +142,7 @@ bool IosDeployStep::init()
void IosDeployStep::doRun()
{
QTC_CHECK(m_transferStatus == NoTransfer);
- if (device().isNull()) {
+ if (m_device.isNull()) {
TaskHub::addTask(
DeploymentTask(Task::Error, tr("Deployment failed. No iOS device found.")));
emit finished(!iossimulator().isNull());
@@ -190,7 +228,7 @@ void IosDeployStep::handleErrorMsg(IosToolHandler *handler, const QString &msg)
if (msg.contains(QLatin1String("AMDeviceInstallApplication returned -402653103")))
TaskHub::addTask(DeploymentTask(Task::Warning, tr("The Info.plist might be incorrect.")));
- emit addOutput(msg, BuildStep::OutputFormat::ErrorMessage);
+ emit addOutput(msg, OutputFormat::ErrorMessage);
}
BuildStepConfigWidget *IosDeployStep::createConfigWidget()
@@ -236,7 +274,7 @@ void IosDeployStep::checkProvisioningProfile()
return;
end += 8;
- Utils::TemporaryFile f("iosdeploy");
+ TemporaryFile f("iosdeploy");
if (!f.open())
return;
f.write(provisionData.mid(start, end - start));
@@ -245,9 +283,9 @@ void IosDeployStep::checkProvisioningProfile()
if (!provisionPlist.contains(QLatin1String("ProvisionedDevices")))
return;
- QStringList deviceIds = provisionPlist.value(QLatin1String("ProvisionedDevices")).toStringList();
- QString targetId = device->uniqueDeviceID();
- foreach (const QString &deviceId, deviceIds) {
+ const QStringList deviceIds = provisionPlist.value("ProvisionedDevices").toStringList();
+ const QString targetId = device->uniqueDeviceID();
+ for (const QString &deviceId : deviceIds) {
if (deviceId == targetId)
return;
}
@@ -263,11 +301,6 @@ void IosDeployStep::checkProvisioningProfile()
emit addTask(task);
}
-IDevice::ConstPtr IosDeployStep::device() const
-{
- return m_device;
-}
-
IosDevice::ConstPtr IosDeployStep::iosdevice() const
{
return m_device.dynamicCast<const IosDevice>();
@@ -278,5 +311,21 @@ IosSimulator::ConstPtr IosDeployStep::iossimulator() const
return m_device.dynamicCast<const IosSimulator>();
}
+// IosDeployStepFactory
+
+IosDeployStepFactory::IosDeployStepFactory()
+{
+ registerStep<IosDeployStep>(stepId());
+ setDisplayName(IosDeployStep::tr("Deploy to iOS device or emulator"));
+ setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
+ setSupportedDeviceTypes({Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE});
+ setRepeatable(false);
+}
+
+Core::Id IosDeployStepFactory::stepId()
+{
+ return "Qt4ProjectManager.IosDeployStep";
+}
+
} // namespace Internal
} // namespace Ios
diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h
index 909aae4f4d..bdd23a74f7 100644
--- a/src/plugins/ios/iosdeploystep.h
+++ b/src/plugins/ios/iosdeploystep.h
@@ -25,64 +25,17 @@
#pragma once
-#include "iosconfigurations.h"
-#include "iosdevice.h"
-#include "iossimulator.h"
-
#include <projectexplorer/buildstep.h>
-#include <projectexplorer/devicesupport/idevice.h>
-
-#include <QProcess>
namespace Ios {
-class IosToolHandler;
namespace Internal {
-class IosDeployStep : public ProjectExplorer::BuildStep
+class IosDeployStepFactory final : public ProjectExplorer::BuildStepFactory
{
- Q_OBJECT
public:
- enum TransferStatus {
- NoTransfer,
- TransferInProgress,
- TransferOk,
- TransferFailed
- };
+ IosDeployStepFactory();
- friend class IosDeployStepFactory;
- IosDeployStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
static Core::Id stepId();
-
- void cleanup();
-private:
- void doRun() override;
- void doCancel() override;
-
- void handleIsTransferringApp(Ios::IosToolHandler *handler, const QString &bundlePath,
- const QString &deviceId, int progress, int maxProgress,
- const QString &info);
- void handleDidTransferApp(Ios::IosToolHandler *handler, const QString &bundlePath, const QString &deviceId,
- Ios::IosToolHandler::OpStatus status);
- void handleFinished(Ios::IosToolHandler *handler);
- void handleErrorMsg(Ios::IosToolHandler *handler, const QString &msg);
- void updateDisplayNames();
-
- bool init() override;
- ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
- ProjectExplorer::IDevice::ConstPtr device() const;
- IosDevice::ConstPtr iosdevice() const;
- IosSimulator::ConstPtr iossimulator() const;
-
- QString deviceId() const;
- void checkProvisioningProfile();
-
- TransferStatus m_transferStatus = NoTransfer;
- IosToolHandler *m_toolHandler = nullptr;
- ProjectExplorer::IDevice::ConstPtr m_device;
- Utils::FilePath m_bundlePath;
- IosDeviceType m_deviceType;
- static const Core::Id Id;
- bool m_expectFail = false;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp
index a597f9b0d6..3b11d06922 100644
--- a/src/plugins/ios/iosdsymbuildstep.cpp
+++ b/src/plugins/ios/iosdsymbuildstep.cpp
@@ -67,12 +67,10 @@ IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, Id id) :
bool IosDsymBuildStep::init()
{
- BuildConfiguration *bc = buildConfiguration();
-
ProcessParameters *pp = processParameters();
- pp->setMacroExpander(bc->macroExpander());
- pp->setWorkingDirectory(bc->buildDirectory());
- Utils::Environment env = bc->environment();
+ pp->setMacroExpander(macroExpander());
+ pp->setWorkingDirectory(buildDirectory());
+ Utils::Environment env = buildEnvironment();
Utils::Environment::setupEnglishOutput(&env);
pp->setEnvironment(env);
pp->setCommandLine({command(), arguments()});
@@ -82,10 +80,6 @@ bool IosDsymBuildStep::init()
// That is mostly so that rebuild works on an already clean project
setIgnoreReturnValue(m_clean);
- setOutputParser(target()->kit()->createOutputParser());
- if (outputParser())
- outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
-
return AbstractProcessStep::init();
}
@@ -192,6 +186,13 @@ void IosDsymBuildStep::doRun()
AbstractProcessStep::doRun();
}
+void IosDsymBuildStep::setupOutputFormatter(OutputFormatter *formatter)
+{
+ formatter->setLineParsers(target()->kit()->createOutputParsers());
+ formatter->addSearchDir(processParameters()->effectiveWorkingDirectory());
+ AbstractProcessStep::setupOutputFormatter(formatter);
+}
+
BuildStepConfigWidget *IosDsymBuildStep::createConfigWidget()
{
return new IosDsymBuildStepConfigWidget(this);
@@ -255,12 +256,10 @@ IosDsymBuildStepConfigWidget::~IosDsymBuildStepConfigWidget()
void IosDsymBuildStepConfigWidget::updateDetails()
{
- BuildConfiguration *bc = m_buildStep->buildConfiguration();
-
ProcessParameters param;
- param.setMacroExpander(bc->macroExpander());
- param.setWorkingDirectory(bc->buildDirectory());
- param.setEnvironment(bc->environment());
+ param.setMacroExpander(m_buildStep->macroExpander());
+ param.setWorkingDirectory(m_buildStep->buildDirectory());
+ param.setEnvironment(m_buildStep->buildEnvironment());
param.setCommandLine({m_buildStep->command(), m_buildStep->arguments()});
setSummaryText(param.summary(displayName()));
diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h
index effc6e5f91..7e08b1a6ad 100644
--- a/src/plugins/ios/iosdsymbuildstep.h
+++ b/src/plugins/ios/iosdsymbuildstep.h
@@ -56,6 +56,7 @@ public:
private:
bool init() override;
void doRun() override;
+ void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
QVariantMap toMap() const override;
bool fromMap(const QVariantMap &map) override;
diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp
index 50540c331f..a112364735 100644
--- a/src/plugins/ios/iosplugin.cpp
+++ b/src/plugins/ios/iosplugin.cpp
@@ -53,19 +53,6 @@ namespace Internal {
Q_LOGGING_CATEGORY(iosLog, "qtc.ios.common", QtWarningMsg)
-class IosDeployStepFactory : public BuildStepFactory
-{
-public:
- IosDeployStepFactory()
- {
- registerStep<IosDeployStep>(IosDeployStep::stepId());
- setDisplayName(IosDeployStep::tr("Deploy to iOS device or emulator"));
- setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
- setSupportedDeviceTypes({Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE});
- setRepeatable(false);
- }
-};
-
class IosDeployConfigurationFactory : public DeployConfigurationFactory
{
public:
@@ -76,7 +63,7 @@ public:
addSupportedTargetDeviceType(Constants::IOS_DEVICE_TYPE);
addSupportedTargetDeviceType(Constants::IOS_SIMULATOR_TYPE);
setDefaultDisplayName(QCoreApplication::translate("Ios::Internal", "Deploy on iOS"));
- addInitialStep(IosDeployStep::stepId());
+ addInitialStep(IosDeployStepFactory::stepId());
}
};
diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp
index 23fb2c5dde..35ca7f39b4 100644
--- a/src/plugins/ios/iosqtversion.cpp
+++ b/src/plugins/ios/iosqtversion.cpp
@@ -72,12 +72,6 @@ Abis IosQtVersion::detectQtAbis() const
return abis;
}
-void IosQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const
-{
- Q_UNUSED(k)
- Q_UNUSED(env)
-}
-
QString IosQtVersion::description() const
{
//: Qt Version is meant for Ios
diff --git a/src/plugins/ios/iosqtversion.h b/src/plugins/ios/iosqtversion.h
index fa119d2f6f..5f82e94569 100644
--- a/src/plugins/ios/iosqtversion.h
+++ b/src/plugins/ios/iosqtversion.h
@@ -45,8 +45,6 @@ public:
ProjectExplorer::Abis detectQtAbis() const override;
- void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override;
-
QSet<Core::Id> availableFeatures() const override;
QSet<Core::Id> targetDeviceTypes() const override;
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 674710df57..d1079ebec7 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -179,7 +179,7 @@ FilePath IosRunConfiguration::bundleDirectory() const
case BuildConfiguration::Debug :
case BuildConfiguration::Unknown :
if (isDevice)
- res = res.pathAppended("Debug-iphoneos");
+ res = res / "Debug-iphoneos";
else
res = res.pathAppended("Debug-iphonesimulator");
break;
diff --git a/src/plugins/ios/iossettingswidget.cpp b/src/plugins/ios/iossettingswidget.cpp
index d5612712cb..609a3a9ce9 100644
--- a/src/plugins/ios/iossettingswidget.cpp
+++ b/src/plugins/ios/iossettingswidget.cpp
@@ -73,7 +73,7 @@ IosSettingsWidget::IosSettingsWidget()
m_ui->deviceView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
m_ui->pathWidget->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_ui->pathWidget->lineEdit()->setReadOnly(true);
- m_ui->pathWidget->setFileName(IosConfigurations::screenshotDir());
+ m_ui->pathWidget->setFilePath(IosConfigurations::screenshotDir());
m_ui->pathWidget->addButton(tr("Screenshot"), this,
std::bind(&IosSettingsWidget::onScreenshot, this));
@@ -280,7 +280,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().pathAppended(fileName).toString();
+ return m_ui->pathWidget->filePath().pathAppended(fileName).toString();
};
QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
@@ -318,7 +318,7 @@ void IosSettingsWidget::onSelectionChanged()
void IosSettingsWidget::saveSettings()
{
IosConfigurations::setIgnoreAllDevices(!m_ui->deviceAskCheckBox->isChecked());
- IosConfigurations::setScreenshotDir(m_ui->pathWidget->fileName());
+ IosConfigurations::setScreenshotDir(m_ui->pathWidget->filePath());
}
} // namespace Internal
diff --git a/src/plugins/ios/iossettingswidget.h b/src/plugins/ios/iossettingswidget.h
index ee944a55ba..e99afb448d 100644
--- a/src/plugins/ios/iossettingswidget.h
+++ b/src/plugins/ios/iossettingswidget.h
@@ -58,7 +58,6 @@ private:
private:
Ui::IosSettingsWidget *m_ui = nullptr;
- bool m_saveSettingsRequested = false;
SimulatorControl *m_simControl = nullptr;
};
View Lorry Controller Status