forked from qt-creator/qt-creator
ProjectExplorer: Un-export ProcessStep
Not used outside. Change-Id: Ibab561d2f49ffce5b2e1d2505ef0634c802221b0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -31,6 +31,8 @@
|
|||||||
#include <projectexplorer/buildstep.h>
|
#include <projectexplorer/buildstep.h>
|
||||||
#include <projectexplorer/buildconfiguration.h>
|
#include <projectexplorer/buildconfiguration.h>
|
||||||
#include <projectexplorer/processparameters.h>
|
#include <projectexplorer/processparameters.h>
|
||||||
|
#include <projectexplorer/projectexplorerconstants.h>
|
||||||
|
|
||||||
#include <utils/fileutils.h>
|
#include <utils/fileutils.h>
|
||||||
|
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <projectexplorer/processstep.h>
|
#include <projectexplorer/abstractprocessstep.h>
|
||||||
|
|
||||||
namespace Nim {
|
namespace Nim {
|
||||||
|
|
||||||
|
@@ -24,28 +24,42 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "processstep.h"
|
#include "processstep.h"
|
||||||
|
|
||||||
|
#include "abstractprocessstep.h"
|
||||||
#include "buildconfiguration.h"
|
#include "buildconfiguration.h"
|
||||||
#include "buildstep.h"
|
|
||||||
#include "kit.h"
|
#include "kit.h"
|
||||||
#include "processparameters.h"
|
#include "processparameters.h"
|
||||||
|
#include "projectconfigurationaspects.h"
|
||||||
#include "projectexplorerconstants.h"
|
#include "projectexplorerconstants.h"
|
||||||
|
#include "projectexplorer_export.h"
|
||||||
#include "target.h"
|
#include "target.h"
|
||||||
|
|
||||||
#include <coreplugin/variablechooser.h>
|
|
||||||
|
|
||||||
#include <utils/fileutils.h>
|
#include <utils/fileutils.h>
|
||||||
#include <utils/macroexpander.h>
|
|
||||||
|
|
||||||
#include <QFormLayout>
|
|
||||||
|
|
||||||
using namespace Utils;
|
using namespace Utils;
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
|
namespace Internal {
|
||||||
|
|
||||||
const char PROCESS_COMMAND_KEY[] = "ProjectExplorer.ProcessStep.Command";
|
const char PROCESS_COMMAND_KEY[] = "ProjectExplorer.ProcessStep.Command";
|
||||||
const char PROCESS_WORKINGDIRECTORY_KEY[] = "ProjectExplorer.ProcessStep.WorkingDirectory";
|
const char PROCESS_WORKINGDIRECTORY_KEY[] = "ProjectExplorer.ProcessStep.WorkingDirectory";
|
||||||
const char PROCESS_ARGUMENTS_KEY[] = "ProjectExplorer.ProcessStep.Arguments";
|
const char PROCESS_ARGUMENTS_KEY[] = "ProjectExplorer.ProcessStep.Arguments";
|
||||||
|
|
||||||
|
class ProcessStep final : public AbstractProcessStep
|
||||||
|
{
|
||||||
|
Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::ProcessStep)
|
||||||
|
|
||||||
|
public:
|
||||||
|
ProcessStep(BuildStepList *bsl, Core::Id id);
|
||||||
|
|
||||||
|
bool init() final;
|
||||||
|
void setupProcessParameters(ProcessParameters *pp);
|
||||||
|
|
||||||
|
BaseStringAspect *m_command;
|
||||||
|
BaseStringAspect *m_arguments;
|
||||||
|
BaseStringAspect *m_workingDirectory;
|
||||||
|
};
|
||||||
|
|
||||||
ProcessStep::ProcessStep(BuildStepList *bsl, Core::Id id)
|
ProcessStep::ProcessStep(BuildStepList *bsl, Core::Id id)
|
||||||
: AbstractProcessStep(bsl, id)
|
: AbstractProcessStep(bsl, id)
|
||||||
{
|
{
|
||||||
@@ -103,9 +117,7 @@ void ProcessStep::setupProcessParameters(ProcessParameters *pp)
|
|||||||
pp->resolveAll();
|
pp->resolveAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
//*******
|
|
||||||
// ProcessStepFactory
|
// ProcessStepFactory
|
||||||
//*******
|
|
||||||
|
|
||||||
ProcessStepFactory::ProcessStepFactory()
|
ProcessStepFactory::ProcessStepFactory()
|
||||||
{
|
{
|
||||||
@@ -113,4 +125,5 @@ ProcessStepFactory::ProcessStepFactory()
|
|||||||
setDisplayName(ProcessStep::tr("Custom Process Step", "item in combobox"));
|
setDisplayName(ProcessStep::tr("Custom Process Step", "item in combobox"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // Internal
|
||||||
} // ProjectExplorer
|
} // ProjectExplorer
|
||||||
|
@@ -25,33 +25,16 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "abstractprocessstep.h"
|
#include "buildstep.h"
|
||||||
#include "projectconfigurationaspects.h"
|
|
||||||
#include "projectexplorer_export.h"
|
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
|
namespace Internal {
|
||||||
|
|
||||||
class ProcessStepFactory : public BuildStepFactory
|
class ProcessStepFactory final : public BuildStepFactory
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ProcessStepFactory();
|
ProcessStepFactory();
|
||||||
};
|
};
|
||||||
|
|
||||||
class PROJECTEXPLORER_EXPORT ProcessStep : public AbstractProcessStep
|
} // namespace Internal
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
friend class ProcessStepFactory;
|
|
||||||
|
|
||||||
public:
|
|
||||||
ProcessStep(BuildStepList *bsl, Core::Id id);
|
|
||||||
|
|
||||||
private:
|
|
||||||
bool init() override;
|
|
||||||
void setupProcessParameters(ProcessParameters *pp);
|
|
||||||
|
|
||||||
ProjectExplorer::BaseStringAspect *m_command;
|
|
||||||
ProjectExplorer::BaseStringAspect *m_arguments;
|
|
||||||
ProjectExplorer::BaseStringAspect *m_workingDirectory;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace ProjectExplorer
|
} // namespace ProjectExplorer
|
||||||
|
Reference in New Issue
Block a user