Merge remote-tracking branch 'origin/6.0'

Change-Id: I560583b200db8f180574256d6d851a867be11c37
2021-11-04 13:52:30 +01:00
parent 8e8e8ddead acfe224281
commit e6d31c2b37
141 changed files with 2743 additions and 299 deletions
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -41,15 +41,11 @@
 #include <vcsbase/vcsoutputwindow.h>
 #include <vcsbase/vcsbaseplugin.h>

-#include <QStringList>
-#include <QDir>
-#include <QProcess>
-#include <QTextCodec>
 #include <QDebug>
 #include <QFileInfo>
-#include <QByteArray>
+#include <QStringList>
+#include <QTextCodec>
 #include <QVariant>
-#include <QProcessEnvironment>

 using namespace Utils;