Move ProjectExplorer::Environment to Utils::Environment

Reviewed-by: dt

src/plugins/projectexplorer/environment.cpp → src/libs/utils/environment.cpp

@@ -33,7 +33,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QString>
 
-using namespace ProjectExplorer;
+using namespace Utils;
 
 QList<EnvironmentItem> EnvironmentItem::fromStringList(QStringList list)
 {

src/plugins/projectexplorer/environment.h → src/libs/utils/environment.h

@@ -27,20 +27,21 @@
 **
 **************************************************************************/
 
-#ifndef ENVIRONMENT_H
-#define ENVIRONMENT_H
+#ifndef UTILS_ENVIRONMENT_H
+#define UTILS_ENVIRONMENT_H
 
-#include "projectexplorer_export.h"
+#include "utils_global.h"
 
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QMap>
 #include <QtCore/QList>
 
-namespace ProjectExplorer {
+namespace Utils {
 
-struct PROJECTEXPLORER_EXPORT EnvironmentItem
+class QTCREATOR_UTILS_EXPORT EnvironmentItem
 {
+public:
     EnvironmentItem(QString n, QString v)
             : name(n), value(v), unset(false)
     {}
@@ -58,7 +59,7 @@ struct PROJECTEXPLORER_EXPORT EnvironmentItem
     static QStringList toStringList(QList<EnvironmentItem> list);
 };
 
-class PROJECTEXPLORER_EXPORT Environment {
+class QTCREATOR_UTILS_EXPORT Environment {
 public:
     typedef QMap<QString, QString>::const_iterator const_iterator;
 
@@ -103,6 +104,6 @@ private:
     QMap<QString, QString> m_values;
 };
 
-} // namespace ProjectExplorer
+} // namespace Utils
 
-#endif // ENVIRONMENT_H
+#endif // UTILS_ENVIRONMENT_H

src/libs/utils/utils-lib.pri

@@ -6,7 +6,8 @@ dll {
 
 INCLUDEPATH += $$PWD
 
-SOURCES += $$PWD/reloadpromptutils.cpp \
+SOURCES += $$PWD/environment.cpp \
+    $$PWD/reloadpromptutils.cpp \
     $$PWD/stringutils.cpp \
     $$PWD/filesearch.cpp \
     $$PWD/pathchooser.cpp \
@@ -61,7 +62,8 @@ unix:!macx {
     HEADERS += $$PWD/unixutils.h
     SOURCES += $$PWD/unixutils.cpp
 }
-HEADERS += $$PWD/utils_global.h \
+HEADERS += $$PWD/environment.h \
+    $$PWD/utils_global.h \
     $$PWD/reloadpromptutils.h \
     $$PWD/stringutils.h \
     $$PWD/filesearch.h \

src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

@@ -40,7 +40,6 @@
 #include "cmakeprojectmanager.h"
 
 #include <utils/pathchooser.h>
-#include <projectexplorer/environment.h>
 #include <projectexplorer/toolchain.h>
 
 #include <QtGui/QVBoxLayout>
@@ -65,7 +64,7 @@ using namespace CMakeProjectManager::Internal;
 //                                   |--> Already existing cbp file (and new enough) --> Page: Ready to load the project
 //                                   |--> Page: Ask for cmd options, run generator
 
-CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, const ProjectExplorer::Environment &env)
+CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, const Utils::Environment &env)
     : m_cmakeManager(cmakeManager),
       m_sourceDirectory(sourceDirectory),
       m_creatingCbpFiles(false),
@@ -99,7 +98,7 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
 
 CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory,
                                                const QString &buildDirectory, CMakeOpenProjectWizard::Mode mode,
-                                               const ProjectExplorer::Environment &env)
+                                               const Utils::Environment &env)
     : m_cmakeManager(cmakeManager),
       m_sourceDirectory(sourceDirectory),
       m_creatingCbpFiles(true),
@@ -119,7 +118,7 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
 
 CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory,
                                                const QString &oldBuildDirectory,
-                                               const ProjectExplorer::Environment &env)
+                                               const Utils::Environment &env)
     : m_cmakeManager(cmakeManager),
       m_sourceDirectory(sourceDirectory),
       m_creatingCbpFiles(true),
@@ -213,7 +212,7 @@ void CMakeOpenProjectWizard::setArguments(const QStringList &args)
     m_arguments = args;
 }
 
-ProjectExplorer::Environment CMakeOpenProjectWizard::environment() const
+Utils::Environment CMakeOpenProjectWizard::environment() const
 {
     return m_environment;
 }
@@ -422,7 +421,7 @@ void CMakeRunPage::runCMake()
 {
     m_runCMake->setEnabled(false);
     m_argumentsLineEdit->setEnabled(false);
-    QStringList arguments = ProjectExplorer::Environment::parseCombinedArgString(m_argumentsLineEdit->text());
+    QStringList arguments = Utils::Environment::parseCombinedArgString(m_argumentsLineEdit->text());
     CMakeManager *cmakeManager = m_cmakeWizard->cmakeManager();
 
 #ifdef Q_OS_WIN
@@ -444,7 +443,7 @@ void CMakeRunPage::runCMake()
 #else // Q_OS_WIN
     QString generator = QLatin1String("-GCodeBlocks - Unix Makefiles");
 #endif
-    ProjectExplorer::Environment env = m_cmakeWizard->environment();
+    Utils::Environment env = m_cmakeWizard->environment();
     if (!m_cmakeWizard->msvcVersion().isEmpty()) {
         // Add the environment of that msvc version to environment
         ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChain::createMSVCToolChain(m_cmakeWizard->msvcVersion(), false);
@@ -482,7 +481,7 @@ void CMakeRunPage::cmakeFinished()
     m_argumentsLineEdit->setEnabled(true);
     m_cmakeProcess->deleteLater();
     m_cmakeProcess = 0;
-    m_cmakeWizard->setArguments(ProjectExplorer::Environment::parseCombinedArgString(m_argumentsLineEdit->text()));
+    m_cmakeWizard->setArguments(Utils::Environment::parseCombinedArgString(m_argumentsLineEdit->text()));
     //TODO Actually test that running cmake was finished, for setting this bool
     m_complete = true;
     emit completeChanged();

src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h

@@ -30,7 +30,7 @@
 #ifndef CMAKEOPENPROJECTWIZARD_H
 #define CMAKEOPENPROJECTWIZARD_H
 
-#include <projectexplorer/environment.h>
+#include <utils/environment.h>
 #include <utils/wizard.h>
 
 #include <QtCore/QProcess>
@@ -67,14 +67,14 @@ public:
     };
 
     // used at importing a project without a .user file
-    CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, const ProjectExplorer::Environment &env);
+    CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, const Utils::Environment &env);
     /// used to update if we have already a .user file
     /// recreates or updates the cbp file
-    CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, const QString &buildDirectory, Mode mode, const ProjectExplorer::Environment &env);
+    CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, const QString &buildDirectory, Mode mode, const Utils::Environment &env);
     /// used to change the build directory of one buildconfiguration
     /// shows a page for selecting a directory
     /// then the run cmake page
-    CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, const QString &oldBuildDirectory, const ProjectExplorer::Environment &env);
+    CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, const QString &oldBuildDirectory, const Utils::Environment &env);
 
     virtual int nextId() const;
     QString buildDirectory() const;
@@ -83,7 +83,7 @@ public:
     CMakeManager *cmakeManager() const;
     QStringList arguments() const;
     void setArguments(const QStringList &args);
-    ProjectExplorer::Environment environment() const;
+    Utils::Environment environment() const;
     QString msvcVersion() const;
     void setMsvcVersion(const QString &version);
     bool existsUpToDateXmlFile() const;
@@ -96,7 +96,7 @@ private:
     QStringList m_arguments;
     QString m_msvcVersion;
     bool m_creatingCbpFiles;
-    ProjectExplorer::Environment m_environment;
+    Utils::Environment m_environment;
 };
 
 class InSourceBuildPage : public QWizardPage

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -56,8 +56,6 @@
 using namespace CMakeProjectManager;
 using namespace CMakeProjectManager::Internal;
 using namespace ProjectExplorer;
-using ProjectExplorer::Environment;
-using ProjectExplorer::EnvironmentItem;
 
 // QtCreator CMake Generator wishlist:
 // Which make targets we need to build to get all executables
@@ -478,7 +476,7 @@ bool CMakeProject::fromMap(const QVariantMap &map)
         // Ask the user for where he wants to build it
         // and the cmake command line
 
-        CMakeOpenProjectWizard copw(m_manager, projectDirectory(), ProjectExplorer::Environment::systemEnvironment());
+        CMakeOpenProjectWizard copw(m_manager, projectDirectory(), Utils::Environment::systemEnvironment());
         if (copw.exec() != QDialog::Accepted)
             return false;
 

src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

@@ -36,7 +36,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/environment.h>
 #include <qtconcurrent/QtConcurrentTools>
 #include <QtCore/QtConcurrentRun>
 #include <QtCore/QCoreApplication>
@@ -103,7 +102,9 @@ bool CMakeManager::hasCodeBlocksMsvcGenerator() const
 // we probably want the process instead of this function
 // cmakeproject then could even run the cmake process in the background, adding the files afterwards
 // sounds like a plan
-void CMakeManager::createXmlFile(QProcess *proc, const QStringList &arguments, const QString &sourceDirectory, const QDir &buildDirectory, const ProjectExplorer::Environment &env, const QString &generator)
+void CMakeManager::createXmlFile(QProcess *proc, const QStringList &arguments,
+                                 const QString &sourceDirectory, const QDir &buildDirectory,
+                                 const Utils::Environment &env, const QString &generator)
 {
     // We create a cbp file, only if we didn't find a cbp file in the base directory
     // Yet that can still override cbp files in subdirectories
@@ -119,7 +120,8 @@ void CMakeManager::createXmlFile(QProcess *proc, const QStringList &arguments, c
     proc->setProcessChannelMode(QProcess::MergedChannels);
     proc->setEnvironment(env.toStringList());
 
-    const QString srcdir = buildDirectory.exists(QLatin1String("CMakeCache.txt")) ? QString(QLatin1Char('.')) : sourceDirectory;
+    const QString srcdir = buildDirectory.exists(QLatin1String("CMakeCache.txt")) ?
+                QString(QLatin1Char('.')) : sourceDirectory;
     proc->start(cmakeExecutable(), QStringList() << srcdir << arguments << generator);
 }
 
@@ -243,7 +245,7 @@ CMakeSettingsPage::~CMakeSettingsPage()
 
 QString CMakeSettingsPage::findCmakeExecutable() const
 {
-    ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
+    Utils::Environment env = Utils::Environment::systemEnvironment();
     return env.searchInPath(QLatin1String("cmake"));
 }
 

src/plugins/cmakeprojectmanager/cmakeprojectmanager.h

@@ -32,7 +32,7 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <projectexplorer/iprojectmanager.h>
-#include <projectexplorer/environment.h>
+#include <utils/environment.h>
 #include <utils/pathchooser.h>
 #include <QtCore/QFuture>
 #include <QtCore/QStringList>
@@ -67,15 +67,15 @@ public:
                        const QStringList &arguments,
                        const QString &sourceDirectory,
                        const QDir &buildDirectory,
-                       const ProjectExplorer::Environment &env,
+                       const Utils::Environment &env,
                        const QString &generator);
     bool hasCodeBlocksMsvcGenerator() const;
     static QString findCbpFile(const QDir &);
 
-    static QString findDumperLibrary(const ProjectExplorer::Environment &env);
+    static QString findDumperLibrary(const Utils::Environment &env);
 private:
     static QString qtVersionForQMake(const QString &qmakePath);
-    static QPair<QString, QString> findQtDir(const ProjectExplorer::Environment &env);
+    static QPair<QString, QString> findQtDir(const Utils::Environment &env);
     Core::Context m_projectContext;
     Core::Context m_projectLanguage;
     CMakeSettingsPage *m_settingsPage;

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -35,7 +35,6 @@
 #include "cmaketarget.h"
 
 #include <coreplugin/coreconstants.h>
-#include <projectexplorer/environment.h>
 #include <projectexplorer/debugginghelper.h>
 #include <utils/qtcassert.h>
 #include <utils/debuggerlanguagechooser.h>
@@ -141,7 +140,7 @@ QString CMakeRunConfiguration::workingDirectory() const
 
 QStringList CMakeRunConfiguration::commandLineArguments() const
 {
-    return ProjectExplorer::Environment::parseCombinedArgString(m_arguments);
+    return Utils::Environment::parseCombinedArgString(m_arguments);
 }
 
 QString CMakeRunConfiguration::title() const
@@ -186,7 +185,7 @@ QVariantMap CMakeRunConfiguration::toMap() const
     map.insert(QLatin1String(USE_TERMINAL_KEY), m_runMode == Console);
     map.insert(QLatin1String(TITLE_KEY), m_title);
     map.insert(QLatin1String(ARGUMENTS_KEY), m_arguments);
-    map.insert(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY), ProjectExplorer::EnvironmentItem::toStringList(m_userEnvironmentChanges));
+    map.insert(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY), Utils::EnvironmentItem::toStringList(m_userEnvironmentChanges));
     map.insert(QLatin1String(BASE_ENVIRONMENT_BASE_KEY), m_baseEnvironmentBase);
 
     return map;
@@ -200,7 +199,7 @@ bool CMakeRunConfiguration::fromMap(const QVariantMap &map)
     m_runMode = map.value(QLatin1String(USE_TERMINAL_KEY)).toBool() ? Console : Gui;
     m_title = map.value(QLatin1String(TITLE_KEY)).toString();
     m_arguments = map.value(QLatin1String(ARGUMENTS_KEY)).toString();
-    m_userEnvironmentChanges = ProjectExplorer::EnvironmentItem::fromStringList(map.value(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY)).toStringList());
+    m_userEnvironmentChanges = Utils::EnvironmentItem::fromStringList(map.value(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY)).toStringList());
     m_baseEnvironmentBase = static_cast<BaseEnvironmentBase>(map.value(QLatin1String(BASE_ENVIRONMENT_BASE_KEY), static_cast<int>(CMakeRunConfiguration::BuildEnvironmentBase)).toInt());
 
     return RunConfiguration::fromMap(map);
@@ -238,13 +237,13 @@ QStringList CMakeRunConfiguration::dumperLibraryLocations() const
     return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryLocationsByInstallData(qtInstallData);
 }
 
-ProjectExplorer::Environment CMakeRunConfiguration::baseEnvironment() const
+Utils::Environment CMakeRunConfiguration::baseEnvironment() const
 {
-    ProjectExplorer::Environment env;
+    Utils::Environment env;
     if (m_baseEnvironmentBase == CMakeRunConfiguration::CleanEnvironmentBase) {
         // Nothing
     } else  if (m_baseEnvironmentBase == CMakeRunConfiguration::SystemEnvironmentBase) {
-        env = ProjectExplorer::Environment::systemEnvironment();
+        env = Utils::Environment::systemEnvironment();
     } else  if (m_baseEnvironmentBase == CMakeRunConfiguration::BuildEnvironmentBase) {
         env = activeBuildConfiguration()->environment();
     }
@@ -276,19 +275,19 @@ CMakeRunConfiguration::BaseEnvironmentBase CMakeRunConfiguration::baseEnvironmen
     return m_baseEnvironmentBase;
 }
 
-ProjectExplorer::Environment CMakeRunConfiguration::environment() const
+Utils::Environment CMakeRunConfiguration::environment() const
 {
-    ProjectExplorer::Environment env = baseEnvironment();
+    Utils::Environment env = baseEnvironment();
     env.modify(userEnvironmentChanges());
     return env;
 }
 
-QList<ProjectExplorer::EnvironmentItem> CMakeRunConfiguration::userEnvironmentChanges() const
+QList<Utils::EnvironmentItem> CMakeRunConfiguration::userEnvironmentChanges() const
 {
     return m_userEnvironmentChanges;
 }
 
-void CMakeRunConfiguration::setUserEnvironmentChanges(const QList<ProjectExplorer::EnvironmentItem> &diff)
+void CMakeRunConfiguration::setUserEnvironmentChanges(const QList<Utils::EnvironmentItem> &diff)
 {
     if (m_userEnvironmentChanges != diff) {
         m_userEnvironmentChanges = diff;
@@ -327,7 +326,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
     fl->setMargin(0);
     fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
     QLineEdit *argumentsLineEdit = new QLineEdit();
-    argumentsLineEdit->setText(ProjectExplorer::Environment::joinArgumentList(cmakeRunConfiguration->commandLineArguments()));
+    argumentsLineEdit->setText(Utils::Environment::joinArgumentList(cmakeRunConfiguration->commandLineArguments()));
     connect(argumentsLineEdit, SIGNAL(textChanged(QString)),
             this, SLOT(setArguments(QString)));
     fl->addRow(tr("Arguments:"), argumentsLineEdit);
@@ -426,7 +425,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
             this, SLOT(workingDirectoryChanged(QString)));
     connect(m_cmakeRunConfiguration, SIGNAL(baseEnvironmentChanged()),
             this, SLOT(baseEnvironmentChanged()));
-    connect(m_cmakeRunConfiguration, SIGNAL(userEnvironmentChangesChanged(QList<ProjectExplorer::EnvironmentItem>)),
+    connect(m_cmakeRunConfiguration, SIGNAL(userEnvironmentChangesChanged(QList<Utils::EnvironmentItem>)),
             this, SLOT(userEnvironmentChangesChanged()));
 
 }

src/plugins/cmakeprojectmanager/cmakerunconfiguration.h

@@ -31,9 +31,9 @@
 #define CMAKERUNCONFIGURATION_H
 
 #include <projectexplorer/applicationrunconfiguration.h>
-#include <projectexplorer/environment.h>
 #include <projectexplorer/persistentsettings.h>
 #include <projectexplorer/environmenteditmodel.h>
+#include <utils/environment.h>
 #include <utils/pathchooser.h>
 #include <utils/detailswidget.h>
 
@@ -69,7 +69,7 @@ public:
     RunMode runMode() const;
     QString workingDirectory() const;
     QStringList commandLineArguments() const;
-    ProjectExplorer::Environment environment() const;
+    Utils::Environment environment() const;
     QWidget *createConfigurationWidget();
 
     void setExecutable(const QString &executable);
@@ -92,7 +92,7 @@ public:
 
 signals:
     void baseEnvironmentChanged();
-    void userEnvironmentChangesChanged(const QList<ProjectExplorer::EnvironmentItem> &diff);
+    void userEnvironmentChangesChanged(const QList<Utils::EnvironmentItem> &diff);
     void workingDirectoryChanged(const QString&);
 
 private slots:
@@ -111,11 +111,11 @@ private:
                                BuildEnvironmentBase = 2};
     void setBaseEnvironmentBase(BaseEnvironmentBase env);
     BaseEnvironmentBase baseEnvironmentBase() const;
-    ProjectExplorer::Environment baseEnvironment() const;
+    Utils::Environment baseEnvironment() const;
     QString baseEnvironmentText() const;
 
-    void setUserEnvironmentChanges(const QList<ProjectExplorer::EnvironmentItem> &diff);
-    QList<ProjectExplorer::EnvironmentItem> userEnvironmentChanges() const;
+    void setUserEnvironmentChanges(const QList<Utils::EnvironmentItem> &diff);
+    QList<Utils::EnvironmentItem> userEnvironmentChanges() const;
 
     RunMode m_runMode;
     QString m_buildTarget;
@@ -123,7 +123,7 @@ private:
     QString m_userWorkingDirectory;
     QString m_title;
     QString m_arguments;
-    QList<ProjectExplorer::EnvironmentItem> m_userEnvironmentChanges;
+    QList<Utils::EnvironmentItem> m_userEnvironmentChanges;
     BaseEnvironmentBase m_baseEnvironmentBase;
     bool m_enabled;
 };

src/plugins/cmakeprojectmanager/makestep.cpp

@@ -238,7 +238,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
 
 void MakeStepConfigWidget::additionalArgumentsEdited()
 {
-    m_makeStep->setAdditionalArguments(Environment::parseCombinedArgString(m_additionalArguments->text()));
+    m_makeStep->setAdditionalArguments(Utils::Environment::parseCombinedArgString(m_additionalArguments->text()));
     updateDetails();
 }
 
@@ -265,7 +265,7 @@ void MakeStepConfigWidget::init()
     // and connect again
     connect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));
 
-    m_additionalArguments->setText(Environment::joinArgumentList(m_makeStep->additionalArguments()));
+    m_additionalArguments->setText(Utils::Environment::joinArgumentList(m_makeStep->additionalArguments()));
     updateDetails();
 
     CMakeProject *pro = m_makeStep->cmakeBuildConfiguration()->cmakeTarget()->cmakeProject();

src/plugins/debugger/debuggerengine.cpp

@@ -53,7 +53,6 @@
 #include <coreplugin/progressmanager/futureprogress.h>
 
 #include <projectexplorer/debugginghelper.h>
-#include <projectexplorer/environment.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
@@ -64,6 +63,7 @@
 
 #include <texteditor/itexteditor.h>
 
+#include <utils/environment.h>
 #include <utils/savedaction.h>
 #include <utils/qtcassert.h>
 
@@ -772,7 +772,7 @@ void DebuggerEngine::startDebugger(DebuggerRunControl *runControl)
         ? d->m_startParameters.attachPID : 0;
 
     if (d->m_startParameters.environment.empty())
-        d->m_startParameters.environment = Environment().toStringList();
+        d->m_startParameters.environment = Utils::Environment().toStringList();
 
     if (d->m_startParameters.breakAtMain)
         breakByFunctionMain();

src/plugins/debugger/debuggerrunner.cpp

@@ -46,7 +46,6 @@
 #endif
 
 #include <projectexplorer/debugginghelper.h>
-#include <projectexplorer/environment.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -54,6 +53,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/applicationrunconfiguration.h> // For LocalApplication*
 
+#include <utils/environment.h>
 #include <utils/qtcassert.h>
 #include <utils/fancymainwindow.h>
 #include <coreplugin/icore.h>
@@ -479,7 +479,7 @@ QString DebuggerRunControl::displayName() const
     return d->m_engine->startParameters().displayName;
 }
 
-void DebuggerRunControl::setCustomEnvironment(ProjectExplorer::Environment env)
+void DebuggerRunControl::setCustomEnvironment(Utils::Environment env)
 {
     d->m_engine->startParameters().environment = env.toStringList();
 }

src/plugins/debugger/debuggerrunner.h

@@ -37,7 +37,7 @@
 
 #include <QtCore/QScopedPointer>
 
-namespace ProjectExplorer {
+namespace Utils {
 class Environment;
 }
 
@@ -104,7 +104,7 @@ public:
 
     void createEngine(const DebuggerStartParameters &startParameters);
 
-    void setCustomEnvironment(ProjectExplorer::Environment env);
+    void setCustomEnvironment(Utils::Environment env);
     void setEnabledEngines(DebuggerEngineType enabledEngines);
 
     void startFailed();

src/plugins/debugger/qml/qmlengine.cpp

@@ -46,9 +46,9 @@
 #include "watchutils.h"
 
 #include <extensionsystem/pluginmanager.h>
-#include <projectexplorer/environment.h>
 #include <projectexplorer/applicationlauncher.h>
 
+#include <utils/environment.h>
 #include <utils/qtcassert.h>
 
 #include <QtCore/QDateTime>

src/plugins/genericprojectmanager/genericbuildconfiguration.cpp

@@ -84,9 +84,9 @@ bool GenericBuildConfiguration::fromMap(const QVariantMap &map)
     return BuildConfiguration::fromMap(map);
 }
 
-ProjectExplorer::Environment GenericBuildConfiguration::environment() const
+Utils::Environment GenericBuildConfiguration::environment() const
 {
-    return ProjectExplorer::Environment::systemEnvironment();
+    return Utils::Environment::systemEnvironment();
 }
 
 QString GenericBuildConfiguration::buildDirectory() const

src/plugins/genericprojectmanager/genericbuildconfiguration.h

@@ -49,7 +49,7 @@ public:
 
     GenericTarget *genericTarget() const;
 
-    virtual ProjectExplorer::Environment environment() const;
+    virtual Utils::Environment environment() const;
     virtual QString buildDirectory() const;
 
     QString rawBuildDirectory() const;

src/plugins/genericprojectmanager/genericmakestep.cpp

@@ -247,7 +247,7 @@ void GenericMakeStepConfigWidget::init()
     m_ui->makeLineEdit->setText(makeCommand);
 
     const QStringList &makeArguments = m_makeStep->m_makeArguments;
-    m_ui->makeArgumentsLineEdit->setText(ProjectExplorer::Environment::joinArgumentList(makeArguments));
+    m_ui->makeArgumentsLineEdit->setText(Utils::Environment::joinArgumentList(makeArguments));
 
     // Disconnect to make the changes to the items
     disconnect(m_ui->targetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));
@@ -267,7 +267,7 @@ void GenericMakeStepConfigWidget::updateDetails()
 {
     m_summaryText = tr("<b>Make:</b> %1 %2")
                     .arg(m_makeStep->makeCommand(),
-                         ProjectExplorer::Environment::joinArgumentList(m_makeStep->replacedArguments()));
+                         Utils::Environment::joinArgumentList(m_makeStep->replacedArguments()));
     emit updateSummary();
 }
 
@@ -291,7 +291,7 @@ void GenericMakeStepConfigWidget::makeLineEditTextEdited()
 void GenericMakeStepConfigWidget::makeArgumentsLineEditTextEdited()
 {
     m_makeStep->m_makeArguments =
-            ProjectExplorer::Environment::parseCombinedArgString(m_ui->makeArgumentsLineEdit->text());
+            Utils::Environment::parseCombinedArgString(m_ui->makeArgumentsLineEdit->text());
     updateDetails();
 }
 

src/plugins/git/gitclient.cpp

@@ -54,8 +54,6 @@
 #include <vcsbase/vcsbaseoutputwindow.h>
 #include <vcsbase/vcsbaseplugin.h>
 
-#include <projectexplorer/environment.h>
-
 #include <QtCore/QRegExp>
 #include <QtCore/QTemporaryFile>
 #include <QtCore/QTime>

src/plugins/projectexplorer/abstractprocessstep.cpp

@@ -124,7 +124,7 @@ void AbstractProcessStep::setIgnoreReturnValue(bool b)
     m_ignoreReturnValue = b;
 }
 
-void AbstractProcessStep::setEnvironment(Environment env)
+void AbstractProcessStep::setEnvironment(Utils::Environment env)
 {
     m_environment = env;
 }