diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index b97cf2e4c58eb09a328b5934cfdfeb1ee7e56324..95bdd4febfdb4f7cfa292c23cd45cfa842ce7975 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -315,3 +315,38 @@ void MakeStepConfigWidget::makeArgumentsLineEditTextEdited()
m_makeStep->setValue(m_buildConfiguration, "makeargs",
ProjectExplorer::Environment::parseCombinedArgString(m_ui.makeArgumentsLineEdit->text()));
}
+
+///
+// MakeStep
+///
+
+MakeStepFactory::MakeStepFactory()
+{
+}
+
+MakeStepFactory::~MakeStepFactory()
+{
+}
+
+bool MakeStepFactory::canCreate(const QString & name) const
+{
+ return (name == Constants::MAKESTEP);
+}
+
+ProjectExplorer::BuildStep * MakeStepFactory::create(ProjectExplorer::Project * pro, const QString & name) const
+{
+ Q_UNUSED(name);
+ return new MakeStep(static_cast<Qt4Project *>(pro));
+}
+
+QStringList MakeStepFactory::canCreateForProject(ProjectExplorer::Project *pro) const
+{
+ Q_UNUSED(pro)
+ return QStringList();
+}
+
+QString MakeStepFactory::displayNameForName(const QString &name) const
+{
+ Q_UNUSED(name);
+ return QString();
+}
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index 12ae6fdb52a7b9417dd620c9f8660fcd3a528b8a..e59711786c31cc779cacda87fa6ff091ecc97f63 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -36,8 +36,28 @@
#include <projectexplorer/abstractprocessstep.h>
#include <projectexplorer/projectexplorer.h>
+namespace ProjectExplorer {
+class BuildStep;
+class IBuildStepFactory;
+class Project;
+}
+
namespace Qt4ProjectManager {
+namespace Internal {
+class MakeStepFactory : public ProjectExplorer::IBuildStepFactory
+{
+ Q_OBJECT
+public:
+ MakeStepFactory();
+ virtual ~MakeStepFactory();
+ bool canCreate(const QString & name) const;
+ ProjectExplorer::BuildStep * create(ProjectExplorer::Project * pro, const QString & name) const;
+ QStringList canCreateForProject(ProjectExplorer::Project *pro) const;
+ QString displayNameForName(const QString &name) const;
+};
+}
+
class Qt4Project;
// NBS move this class to an own plugin? So that there can be a make project at a future time
diff --git a/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp b/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp
deleted file mode 100644
index e38da1ed94ab41fe49254335a39e834d4b1f0fd1..0000000000000000000000000000000000000000
--- a/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-**
-**************************************************************************/
-
-#include "qmakebuildstepfactory.h"
-
-#include "qmakestep.h"
-#include "makestep.h"
-#include "qt4project.h"
-#include "qt4projectmanagerconstants.h"
-
-using namespace Qt4ProjectManager::Internal;
-using namespace ProjectExplorer;
-
-QMakeBuildStepFactory::QMakeBuildStepFactory()
-{
-}
-
-QMakeBuildStepFactory::~QMakeBuildStepFactory()
-{
-}
-
-bool QMakeBuildStepFactory::canCreate(const QString & name) const
-{
- return (name == Constants::QMAKESTEP);
-}
-
-ProjectExplorer::BuildStep * QMakeBuildStepFactory::create(ProjectExplorer::Project * pro, const QString & name) const
-{
- Q_UNUSED(name);
- return new QMakeStep(static_cast<Qt4Project *>(pro));
-}
-
-QStringList QMakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project *pro) const
-{
- Q_UNUSED(pro)
- return QStringList();
-}
-
-QString QMakeBuildStepFactory::displayNameForName(const QString &name) const
-{
- Q_UNUSED(name);
- return QString();
-}
-
-MakeBuildStepFactory::MakeBuildStepFactory()
-{
-}
-
-MakeBuildStepFactory::~MakeBuildStepFactory()
-{
-}
-
-bool MakeBuildStepFactory::canCreate(const QString & name) const
-{
- return (name == Constants::MAKESTEP);
-}
-
-ProjectExplorer::BuildStep * MakeBuildStepFactory::create(ProjectExplorer::Project * pro, const QString & name) const
-{
- Q_UNUSED(name);
- return new MakeStep(static_cast<Qt4Project *>(pro));
-}
-
-QStringList MakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project *pro) const
-{
- Q_UNUSED(pro)
- return QStringList();
-}
-
-QString MakeBuildStepFactory::displayNameForName(const QString &name) const
-{
- Q_UNUSED(name);
- return QString();
-}
diff --git a/src/plugins/qt4projectmanager/qmakebuildstepfactory.h b/src/plugins/qt4projectmanager/qmakebuildstepfactory.h
deleted file mode 100644
index 3271cc3786bd394a43cc876349e7cc57eef05a41..0000000000000000000000000000000000000000
--- a/src/plugins/qt4projectmanager/qmakebuildstepfactory.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-**
-**************************************************************************/
-
-#ifndef QMAKEBUILDSTEPFACTORY_H
-#define QMAKEBUILDSTEPFACTORY_H
-
-#include <projectexplorer/buildstep.h>
-
-#include <QString>
-
-namespace ProjectExplorer {
-class BuildStep;
-class IBuildStepFactory;
-class Project;
-}
-
-namespace Qt4ProjectManager {
-namespace Internal {
-
-class QMakeBuildStepFactory : public ProjectExplorer::IBuildStepFactory
-{
- Q_OBJECT
-public:
- QMakeBuildStepFactory();
- virtual ~QMakeBuildStepFactory();
- bool canCreate(const QString & name) const;
- ProjectExplorer::BuildStep * create(ProjectExplorer::Project * pro, const QString & name) const;
- QStringList canCreateForProject(ProjectExplorer::Project *pro) const;
- QString displayNameForName(const QString &name) const;
-};
-
-class MakeBuildStepFactory : public ProjectExplorer::IBuildStepFactory
-{
- Q_OBJECT
-public:
- MakeBuildStepFactory();
- virtual ~MakeBuildStepFactory();
- bool canCreate(const QString & name) const;
- ProjectExplorer::BuildStep * create(ProjectExplorer::Project * pro, const QString & name) const;
- QStringList canCreateForProject(ProjectExplorer::Project *pro) const;
- QString displayNameForName(const QString &name) const;
-};
-
-} // namespace Internal
-} // namespace Qt4ProjectManager
-
-#endif // QMAKEBUILDSTEPFACTORY_H
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 0d5497c43c6b58c1189b550f05865d8f25376608..514feb9f3716baa1eb9226d40ca6e3f66fd9c2e2 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -272,3 +272,39 @@ void QMakeStepConfigWidget::init(const QString &buildConfiguration)
}
}
+////
+// QMakeStepFactory
+////
+
+QMakeStepFactory::QMakeStepFactory()
+{
+}
+
+QMakeStepFactory::~QMakeStepFactory()
+{
+}
+
+bool QMakeStepFactory::canCreate(const QString & name) const
+{
+ return (name == Constants::QMAKESTEP);
+}
+
+ProjectExplorer::BuildStep * QMakeStepFactory::create(ProjectExplorer::Project * pro, const QString & name) const
+{
+ Q_UNUSED(name);
+ return new QMakeStep(static_cast<Qt4Project *>(pro));
+}
+
+QStringList QMakeStepFactory::canCreateForProject(ProjectExplorer::Project *pro) const
+{
+ Q_UNUSED(pro)
+ return QStringList();
+}
+
+QString QMakeStepFactory::displayNameForName(const QString &name) const
+{
+ Q_UNUSED(name);
+ return QString();
+}
+
+
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index 87f970ff7f9e8204845eb47fe18867d1c1d5cfe1..184f909963effb2acdc383f5ad02c438164aac3a 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -36,9 +36,28 @@
#include <QStringList>
+namespace ProjectExplorer {
+class BuildStep;
+class IBuildStepFactory;
+class Project;
+}
namespace Qt4ProjectManager {
+namespace Internal {
+class QMakeStepFactory : public ProjectExplorer::IBuildStepFactory
+{
+ Q_OBJECT
+public:
+ QMakeStepFactory();
+ virtual ~QMakeStepFactory();
+ bool canCreate(const QString & name) const;
+ ProjectExplorer::BuildStep * create(ProjectExplorer::Project * pro, const QString & name) const;
+ QStringList canCreateForProject(ProjectExplorer::Project *pro) const;
+ QString displayNameForName(const QString &name) const;
+};
+}
+
class Qt4Project;
class QMakeStep : public ProjectExplorer::AbstractProcessStep
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index eaf782e4c2052a9d112d5fba3a1eb0b5bc4624d7..82b3031aceccd5b9237eb1686c536e8e82afe8ff 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -27,7 +27,6 @@ HEADERS = qt4projectmanagerplugin.h \
qt4projectmanagerconstants.h \
makestep.h \
qmakestep.h \
- qmakebuildstepfactory.h \
deployhelper.h \
embeddedpropertiespage.h \
qt4runconfiguration.h \
@@ -57,7 +56,6 @@ SOURCES = qt4projectmanagerplugin.cpp \
wizards/qtwizard.cpp \
makestep.cpp \
qmakestep.cpp \
- qmakebuildstepfactory.cpp \
deployhelper.cpp \
embeddedpropertiespage.cpp \
qt4runconfiguration.cpp \
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 529a927279487d3c0b44dc189b5ab8e35ecbd107..c92813aa2898132ee8816b08757c847317033eb4 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -122,8 +122,8 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
LibraryWizard *libWizard = new LibraryWizard;
addAutoReleasedObject(libWizard);
- addAutoReleasedObject(new QMakeBuildStepFactory);
- addAutoReleasedObject(new MakeBuildStepFactory);
+ addAutoReleasedObject(new QMakeStepFactory);
+ addAutoReleasedObject(new MakeStepFactory);
m_qtVersionManager = new QtVersionManager;
addObject(m_qtVersionManager);
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index 057fa705d672f82f93936f18c9d4a8b8d230a8df..a274d531fd5deb8c8e19bd87acfa8f04411dabc2 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -42,8 +42,8 @@ namespace Internal {
class ProFileEditorFactory;
class ConsoleAppWizard;
class GuiAppWizard;
-class QMakeBuildStepFactory;
-class MakeBuildStepFactory;
+class QMakeStepFactory;
+class MakeStepFactory;
class GccParserFactory;
class MsvcParserFactory;
class QtVersionManager;