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

iOS: De-Q_OBJECT-ify IosBuildStep

Browse Source 
Change-Id: If6b32de1f359e6f18d86caa77dcd6ed311f3adbc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-02-20 17:14:37 +01:00
parent 1627850e81
commit 16e87971cd
2 changed files with 33 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/ios/iosbuildstep.cpp
View File

@@ -38,6 +38,7 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/gcctoolchain.h> #include <projectexplorer/gcctoolchain.h>
#include <projectexplorer/abstractprocessstep.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtparser.h> #include <qtsupport/qtparser.h>
@@ -61,18 +62,41 @@ namespace Ios {
namespace Internal { namespace Internal {
const char IOS_BUILD_STEP_ID[] = "Ios.IosBuildStep"; 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_USE_DEFAULT_ARGS_KEY[] = "Ios.IosBuildStep.XcodeArgumentsUseDefault";
const char BUILD_ARGUMENTS_KEY[] = "Ios.IosBuildStep.XcodeArguments"; const char BUILD_ARGUMENTS_KEY[] = "Ios.IosBuildStep.XcodeArguments";
const char CLEAN_KEY[] = "Ios.IosBuildStep.Clean"; 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 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 // IosBuildStepConfigWidget
// //
class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget class IosBuildStepConfigWidget final : public BuildStepConfigWidget
{ {
public: public:
IosBuildStepConfigWidget(IosBuildStep *buildStep) IosBuildStepConfigWidget(IosBuildStep *buildStep)
@@ -164,8 +188,8 @@ private:
IosBuildStep::IosBuildStep(BuildStepList *parent, Id id) IosBuildStep::IosBuildStep(BuildStepList *parent, Id id)
: AbstractProcessStep(parent, id) : AbstractProcessStep(parent, id)
{ {
setDefaultDisplayName(QCoreApplication::translate("GenericProjectManager::Internal::IosBuildStep", setDefaultDisplayName(tr("xcodebuild"));
IOS_BUILD_STEP_DISPLAY_NAME));
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) { if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
m_clean = true; m_clean = true;
setExtraArguments(QStringList("clean")); setExtraArguments(QStringList("clean"));
@@ -305,8 +329,7 @@ IosBuildStepFactory::IosBuildStepFactory()
Constants::IOS_SIMULATOR_TYPE}); Constants::IOS_SIMULATOR_TYPE});
setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_CLEAN, setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_CLEAN,
ProjectExplorer::Constants::BUILDSTEPS_BUILD}); ProjectExplorer::Constants::BUILDSTEPS_BUILD});
setDisplayName(QCoreApplication::translate("GenericProjectManager::Internal::IosBuildStep", setDisplayName(IosBuildStep::tr("xcodebuild"));
IOS_BUILD_STEP_DISPLAY_NAME));
} }
} // namespace Internal } // namespace Internal

41
src/plugins/ios/iosbuildstep.h
View File

@@ -25,49 +25,12 @@
#pragma once #pragma once
#include <projectexplorer/abstractprocessstep.h> #include <projectexplorer/buildstep.h>
QT_BEGIN_NAMESPACE
class QListWidgetItem;
QT_END_NAMESPACE
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {
class IosBuildStepConfigWidget; class IosBuildStepFactory final : public ProjectExplorer::BuildStepFactory
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
{ {
public: public:
IosBuildStepFactory(); IosBuildStepFactory();