From 92d7e4601ddd0b773e4f59fd85c063c368aaed3c Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 6 May 2022 12:42:03 +0200
Subject: [PATCH] QtcProcess: Forward declare Environment in QtcProcess header

Change-Id: If85a8a07b144c94cb6e45f66dcb06573ef07c777
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/ssh/sshconnection.cpp                              | 1 +
 src/libs/utils/aspects.cpp                                  | 1 +
 src/libs/utils/qtcprocess.h                                 | 2 +-
 src/plugins/coreplugin/locator/executefilter.cpp            | 1 +
 src/plugins/cvs/cvsplugin.cpp                               | 1 +
 src/plugins/git/gerrit/gerritmodel.cpp                      | 1 +
 src/plugins/git/gerrit/gerritplugin.cpp                     | 1 +
 src/plugins/git/gitclient.cpp                               | 1 +
 src/plugins/git/mergetool.cpp                               | 1 +
 src/plugins/mercurial/mercurialclient.cpp                   | 1 +
 src/plugins/perforce/perforceplugin.cpp                     | 1 +
 src/plugins/projectexplorer/devicesupport/devicemanager.cpp | 1 +
 src/plugins/qbsprojectmanager/qbssession.cpp                | 1 +
 src/plugins/subversion/subversionclient.cpp                 | 1 +
 src/plugins/subversion/subversionplugin.cpp                 | 1 +
 src/plugins/vcsbase/vcsbaseclient.cpp                       | 1 +
 src/plugins/vcsbase/vcscommand.cpp                          | 1 +
 17 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp
index df4b9a0a0e2..db6ac36d7d8 100644
--- a/src/libs/ssh/sshconnection.cpp
+++ b/src/libs/ssh/sshconnection.cpp
@@ -29,6 +29,7 @@
 #include "sshlogging_p.h"
 #include "sshsettings.h"
 
+#include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 0b45cac672e..228ea2d8766 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -26,6 +26,7 @@
 #include "aspects.h"
 
 #include "algorithm.h"
+#include "environment.h"
 #include "fancylineedit.h"
 #include "layoutbuilder.h"
 #include "pathchooser.h"
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h
index 8da597767c4..00362eb4617 100644
--- a/src/libs/utils/qtcprocess.h
+++ b/src/libs/utils/qtcprocess.h
@@ -27,7 +27,6 @@
 
 #include "utils_global.h"
 
-#include "environment.h"
 #include "commandline.h"
 #include "processenums.h"
 
@@ -44,6 +43,7 @@ namespace Utils {
 
 namespace Internal { class QtcProcessPrivate; }
 
+class Environment;
 class DeviceProcessHooks;
 class ProcessInterface;
 class ProcessResultData;
diff --git a/src/plugins/coreplugin/locator/executefilter.cpp b/src/plugins/coreplugin/locator/executefilter.cpp
index 5b5a4a9ae25..59d6d7a3212 100644
--- a/src/plugins/coreplugin/locator/executefilter.cpp
+++ b/src/plugins/coreplugin/locator/executefilter.cpp
@@ -28,6 +28,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 #include <utils/algorithm.h>
+#include <utils/environment.h>
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index b3190d872f0..8b3210a9e0a 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -54,6 +54,7 @@
 #include <coreplugin/locator/commandlocator.h>
 #include <coreplugin/vcsmanager.h>
 
+#include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp
index 50169ddb616..8f1f990cbb9 100644
--- a/src/plugins/git/gerrit/gerritmodel.cpp
+++ b/src/plugins/git/gerrit/gerritmodel.cpp
@@ -31,6 +31,7 @@
 #include <vcsbase/vcsoutputwindow.h>
 
 #include <utils/algorithm.h>
+#include <utils/environment.h>
 #include <utils/qtcprocess.h>
 
 #include <QJsonArray>
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp
index d0904f96d6d..f13c8b8c2a2 100644
--- a/src/plugins/git/gerrit/gerritplugin.cpp
+++ b/src/plugins/git/gerrit/gerritplugin.cpp
@@ -51,6 +51,7 @@
 
 #include <vcsbase/vcsoutputwindow.h>
 
+#include <utils/environment.h>
 #include <utils/qtcprocess.h>
 
 #include <QDebug>
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index cedf7715c37..fde98484e0b 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -45,6 +45,7 @@
 #include <utils/algorithm.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/commandline.h>
+#include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/mimeutils.h>
diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index 747737b1e3e..97259483beb 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -31,6 +31,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagebox.h>
 #include <utils/commandline.h>
+#include <utils/environment.h>
 #include <utils/qtcprocess.h>
 #include <vcsbase/vcsoutputwindow.h>
 
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 120ce4a938b..21a50b6f1be 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -36,6 +36,7 @@
 #include <vcsbase/vcsbaseeditorconfig.h>
 #include <vcsbase/vcsbasediffeditorcontroller.h>
 
+#include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 2644d24afb3..1b5d2a03f29 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -45,6 +45,7 @@
 
 #include <texteditor/textdocument.h>
 
+#include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index d15dc0626cc..976c269568e 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -32,6 +32,7 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/algorithm.h>
+#include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/persistentsettings.h>
 #include <utils/portlist.h>
diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp
index 106f7945b4b..76bf4e14c00 100644
--- a/src/plugins/qbsprojectmanager/qbssession.cpp
+++ b/src/plugins/qbsprojectmanager/qbssession.cpp
@@ -34,6 +34,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/taskhub.h>
 #include <utils/algorithm.h>
+#include <utils/environment.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 
diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index 3bc6804950c..3083672d54d 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -41,6 +41,7 @@
 #include <diffeditor/diffutils.h>
 
 #include <utils/algorithm.h>
+#include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 47b67b6362a..97e5ee6649f 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -53,6 +53,7 @@
 #include <coreplugin/messagemanager.h>
 
 #include <utils/algorithm.h>
+#include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/parameteraction.h>
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 8fc4117ce5b..ed5d16bf6ec 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -34,6 +34,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/idocument.h>
 
+#include <utils/environment.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 
diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp
index 85623541eaa..66b422cd936 100644
--- a/src/plugins/vcsbase/vcscommand.cpp
+++ b/src/plugins/vcsbase/vcscommand.cpp
@@ -30,6 +30,7 @@
 
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/vcsmanager.h>
+#include <utils/environment.h>
 #include <utils/globalfilechangeblocker.h>
 #include <utils/qtcprocess.h>