diff options
| author | Jarek Kobus <[email protected]> | 2023-05-03 17:05:35 +0200 |
|---|---|---|
| committer | Jarek Kobus <[email protected]> | 2023-05-04 05:52:26 +0000 |
| commit | a0f6e8dc04291138ec2305fe7c02a0a460f57fac (patch) | |
| tree | ebea45136401d266df5fa567b4dc0a00b70b9c68 | |
| parent | 470c95c94be58905bc3202d3b58175add5f576fa (diff) | |
Utils: Rename qtcprocess.{cpp,h} -> process.{cpp,h}
Follows QtcProcess -> Process rename.
Change-Id: I97235a9a40cb7fd52944515b7ab878d96528f919
Reviewed-by: hjk <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
235 files changed, 250 insertions, 253 deletions
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index c22cdfdca0a..3ee99510552 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -35,8 +35,8 @@ #include <utils/futuresynchronizer.h> #include <utils/hostosinfo.h> #include <utils/mimeutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/qtcsettings.h> #include <utils/threadutils.h> diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index b5669057359..761df90ddcd 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -13,7 +13,7 @@ #include <utils/filesystemwatcher.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDir> #include <QDirIterator> diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt index f26c08c7b56..defbbf27943 100644 --- a/src/libs/utils/CMakeLists.txt +++ b/src/libs/utils/CMakeLists.txt @@ -127,6 +127,7 @@ add_qtc_library(Utils port.cpp port.h portlist.cpp portlist.h predicates.h + process.cpp process.h processenums.h processhandle.cpp processhandle.h processinfo.cpp processinfo.h @@ -139,7 +140,6 @@ add_qtc_library(Utils qrcparser.cpp qrcparser.h qtcassert.cpp qtcassert.h qtcolorbutton.cpp qtcolorbutton.h - qtcprocess.cpp qtcprocess.h qtcsettings.cpp qtcsettings.h ranges.h reloadpromptutils.cpp reloadpromptutils.h diff --git a/src/libs/utils/archive.cpp b/src/libs/utils/archive.cpp index db541293e39..5e62835a20f 100644 --- a/src/libs/utils/archive.cpp +++ b/src/libs/utils/archive.cpp @@ -5,8 +5,8 @@ #include "algorithm.h" #include "mimeutils.h" +#include "process.h" #include "qtcassert.h" -#include "qtcprocess.h" #include "utilstr.h" #include <QSettings> diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index f4cb50b454f..cafd5b0452c 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -4,7 +4,7 @@ #include "buildablehelperlibrary.h" #include "environment.h" #include "hostosinfo.h" -#include "qtcprocess.h" +#include "process.h" #include <QDebug> #include <QRegularExpression> diff --git a/src/libs/utils/clangutils.cpp b/src/libs/utils/clangutils.cpp index 4c8c7d801db..6cf265820e7 100644 --- a/src/libs/utils/clangutils.cpp +++ b/src/libs/utils/clangutils.cpp @@ -4,7 +4,7 @@ #include "clangutils.h" #include "filepath.h" -#include "qtcprocess.h" +#include "process.h" #include "utilstr.h" #include <QVersionNumber> diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp index 6b07fbdeb45..bda098e0f69 100644 --- a/src/libs/utils/devicefileaccess.cpp +++ b/src/libs/utils/devicefileaccess.cpp @@ -13,7 +13,7 @@ #include "utilstr.h" #ifndef UTILS_STATIC_LIBRARY -#include "qtcprocess.h" +#include "process.h" #endif #include <QCoreApplication> diff --git a/src/libs/utils/deviceshell.cpp b/src/libs/utils/deviceshell.cpp index 0641c10c381..627fee3d675 100644 --- a/src/libs/utils/deviceshell.cpp +++ b/src/libs/utils/deviceshell.cpp @@ -3,9 +3,9 @@ #include "deviceshell.h" +#include "process.h" #include "processinterface.h" #include "qtcassert.h" -#include "qtcprocess.h" #include <QLoggingCategory> #include <QScopeGuard> diff --git a/src/libs/utils/filestreamer.cpp b/src/libs/utils/filestreamer.cpp index e4dea9887da..a42e6320008 100644 --- a/src/libs/utils/filestreamer.cpp +++ b/src/libs/utils/filestreamer.cpp @@ -5,7 +5,7 @@ #include "async.h" #include "barrier.h" -#include "qtcprocess.h" +#include "process.h" #include <QFile> #include <QMutex> diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 0c43e8f5273..1fe1e962560 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -10,8 +10,8 @@ #include "hostosinfo.h" #include "macroexpander.h" #include "optionpushbutton.h" +#include "process.h" #include "qtcassert.h" -#include "qtcprocess.h" #include "utilstr.h" #include <QFileDialog> diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/process.cpp index 1fe97b3d2fd..1b11bd8645c 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/process.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "qtcprocess.h" +#include "process.h" #include "algorithm.h" #include "environment.h" @@ -2160,4 +2160,4 @@ void ProcessTaskAdapter::start() } // namespace Utils -#include "qtcprocess.moc" +#include "process.moc" diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/process.h index f89b6f9b22e..f89b6f9b22e 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/process.h diff --git a/src/libs/utils/processinfo.cpp b/src/libs/utils/processinfo.cpp index dc41a8f63ea..0d71e380fbf 100644 --- a/src/libs/utils/processinfo.cpp +++ b/src/libs/utils/processinfo.cpp @@ -4,7 +4,7 @@ #include "processinfo.h" #include "algorithm.h" -#include "qtcprocess.h" +#include "process.h" #include <QDir> #include <QRegularExpression> diff --git a/src/libs/utils/terminalhooks.cpp b/src/libs/utils/terminalhooks.cpp index c7cab040289..b6faae765d5 100644 --- a/src/libs/utils/terminalhooks.cpp +++ b/src/libs/utils/terminalhooks.cpp @@ -4,7 +4,7 @@ #include "terminalhooks.h" #include "filepath.h" -#include "qtcprocess.h" +#include "process.h" #include "terminalcommand.h" #include "terminalinterface.h" diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index ba2bc175f8a..4f628616a10 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -239,6 +239,8 @@ Project { "port.h", "portlist.cpp", "portlist.h", + "process.cpp", + "process.h", "processenums.h", "processhandle.cpp", "processhandle.h", @@ -262,8 +264,6 @@ Project { "qtcassert.h", "qtcolorbutton.cpp", "qtcolorbutton.h", - "qtcprocess.cpp", - "qtcprocess.h", "qtcsettings.cpp", "qtcsettings.h", "reloadpromptutils.cpp", diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index a5f71a95cdc..2e7067ca271 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -11,8 +11,8 @@ #include <utils/algorithm.h> #include <utils/async.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QLoggingCategory> #include <QMainWindow> diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index c79282e536b..b27730b45b0 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -36,7 +36,7 @@ #include <utils/infolabel.h> #include <utils/layoutbuilder.h> #include <utils/pathchooser.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QCheckBox> #include <QComboBox> diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index eccfb2041e8..9c444f6e756 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -34,8 +34,8 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/persistentsettings.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <QApplication> diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp index 09858e36038..67e6c8ff83d 100644 --- a/src/plugins/android/androidcreatekeystorecertificate.cpp +++ b/src/plugins/android/androidcreatekeystorecertificate.cpp @@ -7,7 +7,7 @@ #include <utils/infolabel.h> #include <utils/layoutbuilder.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QCheckBox> #include <QDialog> diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 138740e4a3a..bb4fc51b984 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -21,7 +21,7 @@ #include <utils/fileutils.h> #include <utils/hostosinfo.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QHostAddress> #include <QJsonDocument> diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 2ba26ebc614..979efcb1af4 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -38,8 +38,8 @@ #include <utils/environment.h> #include <utils/futuresynchronizer.h> #include <utils/layoutbuilder.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QCheckBox> #include <QFileDialog> diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index c1afae589bb..a8ae3f8746b 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -22,8 +22,8 @@ #include <projectexplorer/target.h> #include <utils/async.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/url.h> #include <QEventLoop> diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 495f031be45..0ccca7c8f7b 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -36,8 +36,8 @@ #include <utils/algorithm.h> #include <utils/fileutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <QApplication> diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index e2f929f0813..e29bac3476b 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -22,7 +22,7 @@ #include <qtsupport/qtkitinformation.h> #include <utils/hostosinfo.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDir> #include <QLoggingCategory> diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp index e489a1e1e7f..d296dfe677e 100644 --- a/src/plugins/android/androidqmlpreviewworker.cpp +++ b/src/plugins/android/androidqmlpreviewworker.cpp @@ -28,7 +28,7 @@ #include <qtsupport/qtkitinformation.h> #include <utils/async.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDateTime> #include <QDeadlineTimer> diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index ef469da2b62..e62145566a1 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/src/plugins/android/androidrunconfiguration.cpp @@ -18,8 +18,8 @@ #include <qtsupport/qtkitinformation.h> #include <utils/detailswidget.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/utilsicons.h> using namespace ProjectExplorer; diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 0e5f6c6f807..65ef8695580 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -23,7 +23,7 @@ #include <utils/async.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/stringutils.h> #include <utils/temporaryfile.h> #include <utils/url.h> diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index 61354888fd5..1839f7c21c4 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -9,8 +9,8 @@ #include <utils/algorithm.h> #include <utils/async.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <QFutureWatcher> diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 62fed62a81d..2ebc61802de 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -17,8 +17,8 @@ #include <utils/layoutbuilder.h> #include <utils/pathchooser.h> #include <utils/progressindicator.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/utilsicons.h> #include <QCheckBox> diff --git a/src/plugins/android/androidsignaloperation.cpp b/src/plugins/android/androidsignaloperation.cpp index a3fdfeeb835..b6a7699dd4f 100644 --- a/src/plugins/android/androidsignaloperation.cpp +++ b/src/plugins/android/androidsignaloperation.cpp @@ -4,8 +4,8 @@ #include "androidconfigurations.h" #include "androidsignaloperation.h" +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> using namespace Utils; diff --git a/src/plugins/autotest/boost/boosttestoutputreader.cpp b/src/plugins/autotest/boost/boosttestoutputreader.cpp index f91dd25b215..96b0dffd61b 100644 --- a/src/plugins/autotest/boost/boosttestoutputreader.cpp +++ b/src/plugins/autotest/boost/boosttestoutputreader.cpp @@ -9,8 +9,8 @@ #include "../autotesttr.h" #include "../testtreeitem.h" +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QLoggingCategory> #include <QRegularExpression> diff --git a/src/plugins/autotest/gtest/gtestoutputreader.cpp b/src/plugins/autotest/gtest/gtestoutputreader.cpp index 66a4935622e..12e04240162 100644 --- a/src/plugins/autotest/gtest/gtestoutputreader.cpp +++ b/src/plugins/autotest/gtest/gtestoutputreader.cpp @@ -8,7 +8,7 @@ #include "../autotesttr.h" #include <utils/hostosinfo.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QRegularExpression> diff --git a/src/plugins/autotest/testoutputreader.cpp b/src/plugins/autotest/testoutputreader.cpp index 48bab930662..cef36c90e76 100644 --- a/src/plugins/autotest/testoutputreader.cpp +++ b/src/plugins/autotest/testoutputreader.cpp @@ -6,8 +6,8 @@ #include "autotesttr.h" #include "testtreeitem.h" +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QRegularExpression> diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index c0ca216533e..2d9be97b439 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -33,7 +33,7 @@ #include <utils/hostosinfo.h> #include <utils/layoutbuilder.h> #include <utils/outputformat.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QCheckBox> #include <QComboBox> diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp index 9bbccdb86ad..e1cac6b1866 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp +++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp @@ -5,8 +5,8 @@ #include "autotoolsprojectmanagertr.h" +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <QDir> diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp index c236ab32f24..4475be0b964 100644 --- a/src/plugins/baremetal/baremetaldebugsupport.cpp +++ b/src/plugins/baremetal/baremetaldebugsupport.cpp @@ -24,8 +24,8 @@ #include <projectexplorer/toolchain.h> #include <utils/portlist.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> using namespace Debugger; using namespace ProjectExplorer; diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp index d631923788e..c1ee31b7109 100644 --- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp @@ -9,8 +9,8 @@ #include <utils/fileutils.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/variablechooser.h> #include <QComboBox> diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp index 03933cff50e..ca7f25e56f3 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp @@ -9,8 +9,8 @@ #include <utils/fileutils.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/variablechooser.h> #include <QComboBox> diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h index 6f4275769e1..4c14ee7b7c1 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h @@ -10,7 +10,7 @@ #include <projectexplorer/runcontrol.h> // for RunWorker -#include <utils/qtcprocess.h> +#include <utils/process.h> namespace Utils { class PathChooser; } diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index 392d4e8234f..c6653fefbb4 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -15,8 +15,8 @@ #include <utils/algorithm.h> #include <utils/environment.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDebug> #include <QDir> diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index e9662ff0314..3bb2423ab23 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -15,8 +15,8 @@ #include <utils/algorithm.h> #include <utils/environment.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDebug> #include <QDir> diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index 14b20657de8..a35a468d202 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -15,8 +15,8 @@ #include <utils/algorithm.h> #include <utils/environment.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDebug> #include <QDir> diff --git a/src/plugins/beautifier/abstractsettings.cpp b/src/plugins/beautifier/abstractsettings.cpp index 17e36d279cb..fa621fdebcb 100644 --- a/src/plugins/beautifier/abstractsettings.cpp +++ b/src/plugins/beautifier/abstractsettings.cpp @@ -14,7 +14,7 @@ #include <utils/fileutils.h> #include <utils/genericconstants.h> #include <utils/mimeutils.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QFile> #include <QFileInfo> diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp index b7d54de96f2..42b91a785fe 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp @@ -7,8 +7,8 @@ #include <coreplugin/icore.h> +#include <utils/process.h> #include <utils/stringutils.h> -#include <utils/qtcprocess.h> #include <QDateTime> #include <QFile> diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 76db40daeab..3057f2034ac 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -31,8 +31,8 @@ #include <utils/algorithm.h> #include <utils/fileutils.h> #include <utils/mimeutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporarydirectory.h> #include <utils/textutils.h> diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp index 243d63e049a..a284d780b6c 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp @@ -6,7 +6,7 @@ #include "../beautifierconstants.h" #include <coreplugin/icore.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDateTime> #include <QFile> diff --git a/src/plugins/boot2qt/device-detection/qdbwatcher.cpp b/src/plugins/boot2qt/device-detection/qdbwatcher.cpp index 8a18a3b5ac9..869b2d84fcb 100644 --- a/src/plugins/boot2qt/device-detection/qdbwatcher.cpp +++ b/src/plugins/boot2qt/device-detection/qdbwatcher.cpp @@ -8,7 +8,7 @@ #include "../qdbutils.h" #include <utils/filepath.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QFile> #include <QTimer> diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp index dd767fbc7cc..43783279d69 100644 --- a/src/plugins/boot2qt/qdbdevice.cpp +++ b/src/plugins/boot2qt/qdbdevice.cpp @@ -15,8 +15,8 @@ #include <remotelinux/linuxprocessinterface.h> #include <utils/portlist.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/theme/theme.h> #include <QFormLayout> diff --git a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp index 0aa4f74362a..d6e198538f9 100644 --- a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp +++ b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp @@ -13,7 +13,7 @@ #include <debugger/debuggerruncontrol.h> #include <utils/algorithm.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/url.h> using namespace Debugger; diff --git a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp index b99d264066e..4c18253fe17 100644 --- a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp +++ b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp @@ -14,7 +14,7 @@ #include <remotelinux/abstractremotelinuxdeploystep.h> #include <utils/commandline.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp index 6ce706e3c11..8c806cb158f 100644 --- a/src/plugins/boot2qt/qdbplugin.cpp +++ b/src/plugins/boot2qt/qdbplugin.cpp @@ -29,9 +29,9 @@ #include <remotelinux/remotelinux_constants.h> -#include <utils/hostosinfo.h> #include <utils/fileutils.h> -#include <utils/qtcprocess.h> +#include <utils/hostosinfo.h> +#include <utils/process.h> #include <QAction> diff --git a/src/plugins/boot2qt/qdbstopapplicationstep.cpp b/src/plugins/boot2qt/qdbstopapplicationstep.cpp index a9fd0fb2200..3707ef20bc1 100644 --- a/src/plugins/boot2qt/qdbstopapplicationstep.cpp +++ b/src/plugins/boot2qt/qdbstopapplicationstep.cpp @@ -13,7 +13,7 @@ #include <remotelinux/abstractremotelinuxdeploystep.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index 39a27523a0a..2f455886253 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -21,7 +21,7 @@ #include <projectexplorer/toolchain.h> #include <utils/algorithm.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/stringutils.h> #include <utils/tasktree.h> diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp index 7c71acceb92..9d27e9f49b5 100644 --- a/src/plugins/clangtools/clangtoolrunner.cpp +++ b/src/plugins/clangtools/clangtoolrunner.cpp @@ -11,8 +11,8 @@ #include <cppeditor/clangdiagnosticconfigsmodel.h> #include <cppeditor/cpptoolsreuse.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporaryfile.h> #include <QDebug> diff --git a/src/plugins/clangtools/clangtoolsutils.cpp b/src/plugins/clangtools/clangtoolsutils.cpp index 6b5e373daa5..7a812d3750d 100644 --- a/src/plugins/clangtools/clangtoolsutils.cpp +++ b/src/plugins/clangtools/clangtoolsutils.cpp @@ -18,8 +18,8 @@ #include <utils/environment.h> #include <utils/filepath.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <cppeditor/clangdiagnosticconfigsmodel.h> diff --git a/src/plugins/clangtools/executableinfo.cpp b/src/plugins/clangtools/executableinfo.cpp index 0b5d649cf50..22898b5734a 100644 --- a/src/plugins/clangtools/executableinfo.cpp +++ b/src/plugins/clangtools/executableinfo.cpp @@ -7,7 +7,7 @@ #include <coreplugin/messagemanager.h> #include <utils/environment.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDir> #include <QFileInfo> diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index f32e502c1bf..1b3b4d2ae90 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -35,8 +35,8 @@ #include <utils/infobar.h> #include <utils/layoutbuilder.h> #include <utils/parameteraction.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporarydirectory.h> #include <vcsbase/basevcseditorfactory.h> diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp index 82e1b7571de..053c387ee92 100644 --- a/src/plugins/clearcase/clearcasesync.cpp +++ b/src/plugins/clearcase/clearcasesync.cpp @@ -10,8 +10,8 @@ #include <QRegularExpression> #include <QStringList> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QPromise> diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 146c2f853c4..20c85133216 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -46,8 +46,8 @@ #include <utils/checkablemessagebox.h> #include <utils/fileutils.h> #include <utils/macroexpander.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QClipboard> #include <QGuiApplication> diff --git a/src/plugins/cmakeprojectmanager/cmakeformattersettings.cpp b/src/plugins/cmakeprojectmanager/cmakeformattersettings.cpp index 4bb2218340d..258954fa115 100644 --- a/src/plugins/cmakeprojectmanager/cmakeformattersettings.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeformattersettings.cpp @@ -10,7 +10,7 @@ #include <utils/algorithm.h> #include <utils/genericconstants.h> #include <utils/mimeutils.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp index 6b8270db6c8..5922f920452 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp @@ -14,8 +14,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/taskhub.h> +#include <utils/process.h> #include <utils/processinterface.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> using namespace Core; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index 52da1adc8ae..69cdda4c526 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -20,8 +20,8 @@ #include <qtsupport/qtkitinformation.h> #include <utils/algorithm.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/temporarydirectory.h> diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index eae44c15638..9239ea54177 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -10,8 +10,8 @@ #include <utils/algorithm.h> #include <utils/environment.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDir> #include <QJsonDocument> diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index d6438e5d226..c6f8f1225c8 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp @@ -14,8 +14,8 @@ #include <utils/algorithm.h> #include <utils/mimeutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/utilsicons.h> #include <projectexplorer/projecttree.h> diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 0d4404c7144..59237aad79a 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -18,8 +18,8 @@ #include <utils/layoutbuilder.h> #include <utils/macroexpander.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/variablechooser.h> #include <QCheckBox> diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index 14e4d511203..6cafa6ff887 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -16,8 +16,8 @@ #include <utils/algorithm.h> #include <utils/fileutils.h> #include <utils/macroexpander.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QCoreApplication> #include <QDateTime> diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp index 32975986203..0fe0ccd8875 100644 --- a/src/plugins/coreplugin/fileutils.cpp +++ b/src/plugins/coreplugin/fileutils.cpp @@ -17,7 +17,7 @@ #include <utils/commandline.h> #include <utils/environment.h> #include <utils/hostosinfo.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/terminalcommand.h> #include <utils/terminalhooks.h> #include <utils/textfileformat.h> diff --git a/src/plugins/coreplugin/locator/executefilter.cpp b/src/plugins/coreplugin/locator/executefilter.cpp index 43b4d9a3784..630bef03df7 100644 --- a/src/plugins/coreplugin/locator/executefilter.cpp +++ b/src/plugins/coreplugin/locator/executefilter.cpp @@ -11,8 +11,8 @@ #include <utils/algorithm.h> #include <utils/environment.h> #include <utils/macroexpander.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QJsonArray> #include <QJsonObject> diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp index 759b56fb267..587eadc6154 100644 --- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp @@ -16,8 +16,8 @@ #include <utils/link.h> #include <utils/macroexpander.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/variablechooser.h> diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index 06b20610f17..af6c11825d4 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -7,7 +7,7 @@ #include "patchtool.h" #include <utils/environment.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QMessageBox> diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp index 503ab2d3790..c5694016d49 100644 --- a/src/plugins/coreplugin/plugininstallwizard.cpp +++ b/src/plugins/coreplugin/plugininstallwizard.cpp @@ -16,8 +16,8 @@ #include <utils/hostosinfo.h> #include <utils/infolabel.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporarydirectory.h> #include <utils/wizard.h> #include <utils/wizardpage.h> diff --git a/src/plugins/coreplugin/progressmanager/processprogress.cpp b/src/plugins/coreplugin/progressmanager/processprogress.cpp index 2895b402a5c..fce87e0d2b2 100644 --- a/src/plugins/coreplugin/progressmanager/processprogress.cpp +++ b/src/plugins/coreplugin/progressmanager/processprogress.cpp @@ -6,8 +6,8 @@ #include "progressmanager.h" #include "../coreplugintr.h" +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QFutureWatcher> diff --git a/src/plugins/cppcheck/cppcheckrunner.h b/src/plugins/cppcheck/cppcheckrunner.h index 0ec49aceb54..686a6c9eb97 100644 --- a/src/plugins/cppcheck/cppcheckrunner.h +++ b/src/plugins/cppcheck/cppcheckrunner.h @@ -4,7 +4,7 @@ #pragma once #include <utils/filepath.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QHash> #include <QTimer> diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp index 679b3684944..5919a97b84c 100644 --- a/src/plugins/cppeditor/cppcodemodelsettings.cpp +++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp @@ -15,8 +15,8 @@ #include <utils/algorithm.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/settingsutils.h> #include <QDateTime> diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp index 21c75b7cbc1..36c3832641d 100644 --- a/src/plugins/cppeditor/cppmodelmanager.cpp +++ b/src/plugins/cppeditor/cppmodelmanager.cpp @@ -63,8 +63,8 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/savefile.h> #include <utils/temporarydirectory.h> diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index ade37ae8ec1..e3a2ba8ede8 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -45,9 +45,9 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/winutils.h> diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index 0fba6708e9d..84a0dded1a7 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -10,7 +10,7 @@ #include <projectexplorer/devicesupport/idevice.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QElapsedTimer> diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp index ed0933008e2..9db7c0f7e5e 100644 --- a/src/plugins/debugger/dap/dapengine.cpp +++ b/src/plugins/debugger/dap/dapengine.cpp @@ -22,8 +22,8 @@ #include <utils/algorithm.h> #include <utils/environment.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <coreplugin/idocument.h> #include <coreplugin/icore.h> diff --git a/src/plugins/debugger/dap/dapengine.h b/src/plugins/debugger/dap/dapengine.h index 9b554d668ba..2fa3019cad9 100644 --- a/src/plugins/debugger/dap/dapengine.h +++ b/src/plugins/debugger/dap/dapengine.h @@ -4,7 +4,7 @@ #pragma once #include <debugger/debuggerengine.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QVariant> diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index d387ce142c1..a59e48ecf99 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -54,10 +54,10 @@ #include <utils/basetreeview.h> #include <utils/checkablemessagebox.h> #include <utils/macroexpander.h> +#include <utils/process.h> #include <utils/processhandle.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/styledbar.h> #include <utils/utilsicons.h> diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index 76630f2e7dc..241ac32ecdd 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -12,8 +12,8 @@ #include <utils/filepath.h> #include <utils/hostosinfo.h> #include <utils/macroexpander.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/utilsicons.h> #include <utils/winutils.h> diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index f418ace88e6..42f9af0800c 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -22,8 +22,8 @@ #include <utils/hostosinfo.h> #include <utils/pathchooser.h> #include <utils/persistentsettings.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/treemodel.h> #include <utils/winutils.h> diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 5e5da91df6a..663ad5bf6d4 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -35,8 +35,8 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/portlist.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporarydirectory.h> #include <utils/temporaryfile.h> #include <utils/url.h> diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp index db5d8698ded..9d3af533bcc 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp @@ -12,8 +12,8 @@ #include <utils/hostosinfo.h> #include <utils/layoutbuilder.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/variablechooser.h> #include <QFileDialog> diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 6068294e40e..5ea6162a644 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -38,9 +38,9 @@ #include <utils/algorithm.h> #include <utils/environment.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/temporaryfile.h> diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index 6a6e68991b5..64a2eddd4eb 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -15,7 +15,7 @@ #include <debugger/outputcollector.h> #include <utils/id.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QProcess> #include <QTextCodec> diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 91ef914c553..3f182c828b9 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -29,9 +29,9 @@ #include <coreplugin/icore.h> #include <utils/environment.h> +#include <utils/process.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QApplication> #include <QDateTime> diff --git a/src/plugins/debugger/lldb/lldbengine.h b/src/plugins/debugger/lldb/lldbengine.h index 2f5fe0d7688..db11af9c104 100644 --- a/src/plugins/debugger/lldb/lldbengine.h +++ b/src/plugins/debugger/lldb/lldbengine.h @@ -11,7 +11,7 @@ #include <debugger/debuggertooltipmanager.h> #include <debugger/debuggerprotocol.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QPointer> #include <QProcess> diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp index a904e1d7897..4f063b57288 100644 --- a/src/plugins/debugger/moduleshandler.cpp +++ b/src/plugins/debugger/moduleshandler.cpp @@ -11,8 +11,8 @@ #include <utils/basetreeview.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/treemodel.h> #include <QCoreApplication> diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 54a347fb151..accf32d0e6e 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -22,8 +22,8 @@ #include <utils/algorithm.h> #include <utils/environment.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <coreplugin/idocument.h> #include <coreplugin/icore.h> diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h index 49dceb24417..1e365b36a7f 100644 --- a/src/plugins/debugger/pdb/pdbengine.h +++ b/src/plugins/debugger/pdb/pdbengine.h @@ -4,7 +4,7 @@ #pragma once #include <debugger/debuggerengine.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QVariant> diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 096ddc13264..033069c1165 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -40,8 +40,8 @@ #include <utils/basetreeview.h> #include <utils/fileinprojectfinder.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/treemodel.h> #include <QDebug> diff --git a/src/plugins/debugger/terminal.cpp b/src/plugins/debugger/terminal.cpp index 4b96d1a0a91..cc309541a81 100644 --- a/src/plugins/debugger/terminal.cpp +++ b/src/plugins/debugger/terminal.cpp @@ -11,8 +11,8 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDebug> #include <QIODevice> diff --git a/src/plugins/docker/dockerapi.cpp b/src/plugins/docker/dockerapi.cpp index 3ffa59b52b4..ffc14148597 100644 --- a/src/plugins/docker/dockerapi.cpp +++ b/src/plugins/docker/dockerapi.cpp @@ -7,8 +7,8 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <utils/async.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QLoggingCategory> diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 64d3dcd6da9..d1175a8b5f9 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -44,9 +44,9 @@ #include <utils/overridecursor.h> #include <utils/pathlisteditor.h> #include <utils/port.h> +#include <utils/process.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/sortfiltermodel.h> #include <utils/temporaryfile.h> #include <utils/terminalhooks.h> diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index b13ff9dfcef..347e3a2b7b3 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -50,8 +50,8 @@ #include <utils/hostosinfo.h> #include <utils/layoutbuilder.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stylehelper.h> #include <cppeditor/cppeditorconstants.h> diff --git a/src/plugins/fossil/fossilclient.cpp b/src/plugins/fossil/fossilclient.cpp index 16038150cb9..358a66caafb 100644 --- a/src/plugins/fossil/fossilclient.cpp +++ b/src/plugins/fossil/fossilclient.cpp @@ -16,9 +16,9 @@ #include <utils/algorithm.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/processenums.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/utilsicons.h> #include <QSyntaxHighlighter> diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 5553e0a7404..906eeb5809a 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -38,8 +38,8 @@ #include <utils/algorithm.h> #include <utils/filesystemwatcher.h> #include <utils/fileutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDir> #include <QFileInfo> diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 275b00efbbe..aeeea39fff2 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -11,8 +11,8 @@ #include <vcsbase/vcsoutputwindow.h> #include <utils/environment.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <QDateTime> diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index 2f93a2c7a16..8e4a6bdc997 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -12,7 +12,7 @@ #include <utils/completinglineedit.h> #include <utils/layoutbuilder.h> #include <utils/pathchooser.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/theme/theme.h> #include <QCompleter> diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index 4791a41d4f5..6457117b322 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -10,8 +10,8 @@ #include <utils/algorithm.h> #include <utils/environment.h> +#include <utils/process.h> #include <utils/processinterface.h> -#include <utils/qtcprocess.h> #include <QApplication> #include <QDebug> diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 0f5a393b1de..8ffc7a6d447 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -22,8 +22,8 @@ #include <coreplugin/vcsmanager.h> #include <utils/environment.h> +#include <utils/process.h> #include <utils/processinterface.h> -#include <utils/qtcprocess.h> #include <vcsbase/vcsoutputwindow.h> diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index ab5c8cc58a8..a196d703ed3 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -27,8 +27,8 @@ #include <utils/fileutils.h> #include <utils/hostosinfo.h> #include <utils/mimeutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporaryfile.h> #include <utils/theme/theme.h> diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 0c4e4126255..a52276f381b 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -13,7 +13,7 @@ #include <utils/fileutils.h> #include <utils/futuresynchronizer.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QObject> #include <QString> diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp index 2f70cddc822..edd042c9b9c 100644 --- a/src/plugins/git/gitgrep.cpp +++ b/src/plugins/git/gitgrep.cpp @@ -17,8 +17,8 @@ #include <utils/environment.h> #include <utils/fancylineedit.h> #include <utils/filesearch.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QCheckBox> #include <QFuture> diff --git a/src/plugins/git/mergetool.h b/src/plugins/git/mergetool.h index 1fd32e3a4fe..727f9a85df0 100644 --- a/src/plugins/git/mergetool.h +++ b/src/plugins/git/mergetool.h @@ -3,7 +3,7 @@ #pragma once -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QObject> #include <QStringList> diff --git a/src/plugins/gitlab/gitlabclonedialog.cpp b/src/plugins/gitlab/gitlabclonedialog.cpp index 4d54105e447..3a061b9cc57 100644 --- a/src/plugins/gitlab/gitlabclonedialog.cpp +++ b/src/plugins/gitlab/gitlabclonedialog.cpp @@ -23,8 +23,8 @@ #include <utils/infolabel.h> #include <utils/mimeutils.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <vcsbase/vcsbaseplugin.h> #include <vcsbase/vcscommand.h> diff --git a/src/plugins/gitlab/queryrunner.h b/src/plugins/gitlab/queryrunner.h index bdb5e06034a..08afc56e1b6 100644 --- a/src/plugins/gitlab/queryrunner.h +++ b/src/plugins/gitlab/queryrunner.h @@ -4,7 +4,7 @@ #pragma once #include <utils/id.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QObject> diff --git a/src/plugins/haskell/haskellmanager.cpp b/src/plugins/haskell/haskellmanager.cpp index 250b795af79..fbd4ee8aa03 100644 --- a/src/plugins/haskell/haskellmanager.cpp +++ b/src/plugins/haskell/haskellmanager.cpp @@ -10,8 +10,8 @@ #include <utils/commandline.h> #include <utils/hostosinfo.h> #include <utils/mimeutils.h> +#include <utils/process.h> #include <utils/processenums.h> -#include <utils/qtcprocess.h> #include <QCoreApplication> #include <QDir> diff --git a/src/plugins/incredibuild/cmakecommandbuilder.cpp b/src/plugins/incredibuild/cmakecommandbuilder.cpp index 8732601cbc4..2f0dd751ae9 100644 --- a/src/plugins/incredibuild/cmakecommandbuilder.cpp +++ b/src/plugins/incredibuild/cmakecommandbuilder.cpp @@ -8,7 +8,7 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildsteplist.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <cmakeprojectmanager/cmakeprojectconstants.h> // Compile-time only diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index e4771d97e84..7831d84e239 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -20,8 +20,8 @@ #include <projectexplorer/toolchain.h> #include <utils/filepath.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QGridLayout> #include <QLabel> diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 0eab6b7947a..04e4363a2a1 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -31,8 +31,8 @@ #include <qtsupport/qtversionfactory.h> #include <utils/algorithm.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDir> #include <QDomDocument> diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index 33ff0e7e202..2d0e2b841f0 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/src/plugins/ios/iosdsymbuildstep.cpp @@ -9,21 +9,22 @@ #include "iostr.h" #include <extensionsystem/pluginmanager.h> -#include <projectexplorer/target.h> -#include <projectexplorer/project.h> + +#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildsteplist.h> #include <projectexplorer/kitinformation.h> #include <projectexplorer/processparameters.h> +#include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> -#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/projectexplorerconstants.h> +#include <projectexplorer/target.h> #include <qtsupport/qtkitinformation.h> #include <qtsupport/qtparser.h> -#include <utils/stringutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> +#include <utils/stringutils.h> #include <QGridLayout> #include <QLabel> diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp index 7b3e977e963..e6fca977b25 100644 --- a/src/plugins/ios/iosprobe.cpp +++ b/src/plugins/ios/iosprobe.cpp @@ -4,7 +4,7 @@ #include "iosprobe.h" #include <utils/algorithm.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QFileInfo> #include <QLoggingCategory> diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 5c9170f2bae..8a0a3e62dcf 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -21,9 +21,9 @@ #include <utils/algorithm.h> #include <utils/filepath.h> -#include <utils/qtcprocess.h> -#include <utils/qtcassert.h> #include <utils/layoutbuilder.h> +#include <utils/process.h> +#include <utils/qtcassert.h> #include <QAction> #include <QApplication> diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index c01c3c859dc..828bb65c007 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -27,7 +27,7 @@ #include <qmldebug/qmloutputparser.h> #include <utils/fileutils.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/url.h> #include <utils/utilsicons.h> diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp index 2caa691c927..fa68c4031e3 100644 --- a/src/plugins/ios/iossimulator.cpp +++ b/src/plugins/ios/iossimulator.cpp @@ -8,7 +8,7 @@ #include <projectexplorer/kitinformation.h> #include <utils/port.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QMapIterator> diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index fa5d0c3ac44..0e4545bf1da 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -15,8 +15,8 @@ #include <utils/async.h> #include <utils/filepath.h> #include <utils/futuresynchronizer.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporarydirectory.h> #include <QDir> diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp index 9d50088cd96..0832a5faf37 100644 --- a/src/plugins/ios/simulatorcontrol.cpp +++ b/src/plugins/ios/simulatorcontrol.cpp @@ -6,8 +6,8 @@ #include <utils/algorithm.h> #include <utils/async.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #ifdef Q_OS_MAC #include <CoreFoundation/CoreFoundation.h> diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp index 08d7429acd6..77b2cbfdee5 100644 --- a/src/plugins/languageclient/client.cpp +++ b/src/plugins/languageclient/client.cpp @@ -53,7 +53,7 @@ #include <texteditor/texteditorsettings.h> #include <utils/mimeutils.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDebug> #include <QJsonDocument> diff --git a/src/plugins/languageclient/languageclientinterface.h b/src/plugins/languageclient/languageclientinterface.h index ec1fc8206f9..7577f136913 100644 --- a/src/plugins/languageclient/languageclientinterface.h +++ b/src/plugins/languageclient/languageclientinterface.h @@ -8,7 +8,7 @@ #include <languageserverprotocol/jsonrpcmessages.h> #include <utils/environment.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/temporaryfile.h> #include <QBuffer> diff --git a/src/plugins/mcusupport/mcuqmlprojectnode.h b/src/plugins/mcusupport/mcuqmlprojectnode.h index 2a06e5cde55..bf40a696f6b 100644 --- a/src/plugins/mcusupport/mcuqmlprojectnode.h +++ b/src/plugins/mcusupport/mcuqmlprojectnode.h @@ -9,7 +9,7 @@ #include <utils/filepath.h> #include <utils/osspecificaspects.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> diff --git a/src/plugins/mcusupport/mcusupportversiondetection.cpp b/src/plugins/mcusupport/mcusupportversiondetection.cpp index 2ea28c38525..f92a443c4fc 100644 --- a/src/plugins/mcusupport/mcusupportversiondetection.cpp +++ b/src/plugins/mcusupport/mcusupportversiondetection.cpp @@ -3,7 +3,7 @@ #include "mcusupportversiondetection.h" -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDir> #include <QRegularExpression> diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 62439896500..1d8d542ed91 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -12,8 +12,8 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <vcsbase/vcsbasediffeditorcontroller.h> #include <vcsbase/vcsbaseeditor.h> diff --git a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp index bd90ee818c6..514c529212a 100644 --- a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp +++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp @@ -19,7 +19,7 @@ #include <projectexplorer/projectexplorer.h> #include <utils/fileutils.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDir> diff --git a/src/plugins/mesonprojectmanager/mesonprocess.cpp b/src/plugins/mesonprojectmanager/mesonprocess.cpp index 5732f617e76..2e4ba024559 100644 --- a/src/plugins/mesonprojectmanager/mesonprocess.cpp +++ b/src/plugins/mesonprojectmanager/mesonprocess.cpp @@ -13,7 +13,7 @@ #include <projectexplorer/taskhub.h> #include <utils/environment.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/stringutils.h> #include <QLoggingCategory> diff --git a/src/plugins/mesonprojectmanager/mesonwrapper.h b/src/plugins/mesonprojectmanager/mesonwrapper.h index 668c78bc4cd..6ec1e57a0f1 100644 --- a/src/plugins/mesonprojectmanager/mesonwrapper.h +++ b/src/plugins/mesonprojectmanager/mesonwrapper.h @@ -9,7 +9,7 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/id.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QFile> #include <QFileInfo> diff --git a/src/plugins/mesonprojectmanager/toolwrapper.cpp b/src/plugins/mesonprojectmanager/toolwrapper.cpp index e3e54ef1b2d..83ed27f495d 100644 --- a/src/plugins/mesonprojectmanager/toolwrapper.cpp +++ b/src/plugins/mesonprojectmanager/toolwrapper.cpp @@ -3,7 +3,7 @@ #include "toolwrapper.h" -#include <utils/qtcprocess.h> +#include <utils/process.h> namespace MesonProjectManager { namespace Internal { diff --git a/src/plugins/nim/project/nimblebuildsystem.cpp b/src/plugins/nim/project/nimblebuildsystem.cpp index f9be804571d..3a8ccb08d62 100644 --- a/src/plugins/nim/project/nimblebuildsystem.cpp +++ b/src/plugins/nim/project/nimblebuildsystem.cpp @@ -10,8 +10,8 @@ #include <projectexplorer/taskhub.h> #include <utils/algorithm.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index 87f93e53e2a..588098619a2 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -16,8 +16,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QComboBox> #include <QFormLayout> diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp index 159985f59d4..21b441fa6ce 100644 --- a/src/plugins/nim/project/nimtoolchain.cpp +++ b/src/plugins/nim/project/nimtoolchain.cpp @@ -9,7 +9,7 @@ #include <projectexplorer/abi.h> #include <utils/environment.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QRegularExpression> diff --git a/src/plugins/nim/suggest/server.h b/src/plugins/nim/suggest/server.h index a9f7d49b889..9eb2bac141d 100644 --- a/src/plugins/nim/suggest/server.h +++ b/src/plugins/nim/suggest/server.h @@ -7,7 +7,7 @@ #include <QFile> #include <QObject> -#include <utils/qtcprocess.h> +#include <utils/process.h> namespace Nim { namespace Suggest { diff --git a/src/plugins/perforce/perforcechecker.h b/src/plugins/perforce/perforcechecker.h index 5f7d2b16739..d0f608de705 100644 --- a/src/plugins/perforce/perforcechecker.h +++ b/src/plugins/perforce/perforcechecker.h @@ -4,7 +4,7 @@ #pragma once #include <utils/filepath.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> namespace Perforce::Internal { diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 336ee8e7dc4..c6f4082767e 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -27,8 +27,8 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/parameteraction.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporarydirectory.h> #include <vcsbase/basevcseditorfactory.h> diff --git a/src/plugins/perfprofiler/perfconfigwidget.cpp b/src/plugins/perfprofiler/perfconfigwidget.cpp index eed31e373a2..e5e3fd37256 100644 --- a/src/plugins/perfprofiler/perfconfigwidget.cpp +++ b/src/plugins/perfprofiler/perfconfigwidget.cpp @@ -14,8 +14,8 @@ #include <utils/aspects.h> #include <utils/layoutbuilder.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QComboBox> #include <QHeaderView> diff --git a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp index 68ba9e883f3..8579a9cf7cb 100644 --- a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp +++ b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp @@ -17,7 +17,7 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QAction> #include <QMessageBox> diff --git a/src/plugins/perfprofiler/perfsettings.cpp b/src/plugins/perfprofiler/perfsettings.cpp index 9bea76b3e29..e5f307b85ae 100644 --- a/src/plugins/perfprofiler/perfsettings.cpp +++ b/src/plugins/perfprofiler/perfsettings.cpp @@ -10,7 +10,7 @@ #include <QSettings> -#include <utils/qtcprocess.h> +#include <utils/process.h> using namespace Utils; diff --git a/src/plugins/perfprofiler/perftracepointdialog.cpp b/src/plugins/perfprofiler/perftracepointdialog.cpp index 004f9aa0e15..3920b526b89 100644 --- a/src/plugins/perfprofiler/perftracepointdialog.cpp +++ b/src/plugins/perfprofiler/perftracepointdialog.cpp @@ -11,9 +11,9 @@ #include <projectexplorer/projectmanager.h> #include <projectexplorer/target.h> -#include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/layoutbuilder.h> +#include <utils/process.h> +#include <utils/qtcassert.h> #include <QComboBox> #include <QDialogButtonBox> diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index eca8b5c44f4..ddc2a8551a2 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -12,8 +12,8 @@ #include <utils/fileutils.h> #include <utils/outputformatter.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QTextDecoder> diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp index 34ab30442d3..7d1174839dd 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp @@ -8,7 +8,7 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/temporarydirectory.h> #include <QFileInfo> diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp index 82734cf6a9f..26d296b181b 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp @@ -15,8 +15,8 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/portlist.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/terminalcommand.h> #include <utils/terminalhooks.h> #include <utils/url.h> diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index 8973a7baf60..aa017df46b0 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -14,8 +14,8 @@ #include <utils/environment.h> #include <utils/fsengine/fsengine.h> #include <utils/persistentsettings.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/terminalhooks.h> diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp index b04397a66b9..fbe300bf269 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp @@ -9,8 +9,8 @@ #include <utils/port.h> #include <utils/portlist.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/url.h> diff --git a/src/plugins/projectexplorer/devicesupport/sshparameters.cpp b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp index 8b67f300dbb..744e350eaef 100644 --- a/src/plugins/projectexplorer/devicesupport/sshparameters.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp @@ -8,8 +8,8 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDebug> diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index e60d6cb5d16..8830aadf856 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/src/plugins/projectexplorer/extracompiler.cpp @@ -16,7 +16,7 @@ #include <utils/async.h> #include <utils/expected.h> #include <utils/guard.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDateTime> #include <QLoggingCategory> diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 40a97737db3..4012fbd6690 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -20,8 +20,8 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QBuffer> #include <QCheckBox> diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index 9a3a939f34f..b3b9c934868 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/src/plugins/projectexplorer/makestep.cpp @@ -18,7 +18,7 @@ #include <utils/hostosinfo.h> #include <utils/layoutbuilder.h> #include <utils/pathchooser.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/utilsicons.h> #include <utils/variablechooser.h> diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 87547b2a79a..d4d518de44d 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -19,8 +19,8 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporarydirectory.h> #include <utils/winutils.h> diff --git a/src/plugins/projectexplorer/processparameters.cpp b/src/plugins/projectexplorer/processparameters.cpp index 49b50dccb3a..0b3d6d83c7a 100644 --- a/src/plugins/projectexplorer/processparameters.cpp +++ b/src/plugins/projectexplorer/processparameters.cpp @@ -5,7 +5,7 @@ #include <utils/fileutils.h> #include <utils/macroexpander.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/theme/theme.h> #include <utils/utilstr.h> diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index d318de8cc34..bc5a0ef4d65 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -25,8 +25,8 @@ #include <utils/dropsupport.h> #include <utils/fsengine/fileiconprovider.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/theme/theme.h> diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index d90fbc7272a..88dd720ee31 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -19,8 +19,8 @@ #include <utils/fancylineedit.h> #include <utils/layoutbuilder.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/utilsicons.h> #include <QCheckBox> diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index 3f0accdc314..3843e4c0e59 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -25,9 +25,9 @@ #include <utils/checkablemessagebox.h> #include <utils/fileinprojectfinder.h> #include <utils/outputformatter.h> +#include <utils/process.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/utilsicons.h> #include <coreplugin/icontext.h> diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp index 3b11c8f1471..fd1e8a78c64 100644 --- a/src/plugins/projectexplorer/targetsetuppage.cpp +++ b/src/plugins/projectexplorer/targetsetuppage.cpp @@ -11,18 +11,17 @@ #include "project.h" #include "projectexplorerconstants.h" #include "projectexplorertr.h" -#include "session.h" #include "target.h" #include "targetsetupwidget.h" #include "task.h" #include <coreplugin/icore.h> -#include <utils/qtcassert.h> -#include <utils/qtcprocess.h> -#include <utils/wizard.h> #include <utils/algorithm.h> #include <utils/fancylineedit.h> +#include <utils/process.h> +#include <utils/qtcassert.h> +#include <utils/wizard.h> #include <QApplication> #include <QCheckBox> diff --git a/src/plugins/projectexplorer/taskfile.cpp b/src/plugins/projectexplorer/taskfile.cpp index 6375d12ee7e..f137b0f812c 100644 --- a/src/plugins/projectexplorer/taskfile.cpp +++ b/src/plugins/projectexplorer/taskfile.cpp @@ -14,8 +14,8 @@ #include <utils/algorithm.h> #include <utils/filepath.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QAction> #include <QMessageBox> diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.cpp b/src/plugins/projectexplorer/toolchainconfigwidget.cpp index ef97ad72cfd..84b80b4e047 100644 --- a/src/plugins/projectexplorer/toolchainconfigwidget.cpp +++ b/src/plugins/projectexplorer/toolchainconfigwidget.cpp @@ -7,8 +7,8 @@ #include "projectexplorertr.h" #include <utils/detailswidget.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QFormLayout> #include <QLineEdit> diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp index 646e336643e..ae900ea818d 100644 --- a/src/plugins/projectexplorer/userfileaccessor.cpp +++ b/src/plugins/projectexplorer/userfileaccessor.cpp @@ -18,8 +18,8 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/persistentsettings.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QRegularExpression> diff --git a/src/plugins/python/pipsupport.cpp b/src/plugins/python/pipsupport.cpp index db456479459..8e3f55dd11b 100644 --- a/src/plugins/python/pipsupport.cpp +++ b/src/plugins/python/pipsupport.cpp @@ -16,7 +16,7 @@ #include <utils/algorithm.h> #include <utils/async.h> #include <utils/mimeutils.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> using namespace Utils; diff --git a/src/plugins/python/pipsupport.h b/src/plugins/python/pipsupport.h index fefd3295755..4d08a3b1ea6 100644 --- a/src/plugins/python/pipsupport.h +++ b/src/plugins/python/pipsupport.h @@ -4,7 +4,7 @@ #pragma once #include <utils/filepath.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QFutureWatcher> #include <QTimer> diff --git a/src/plugins/python/pyside.cpp b/src/plugins/python/pyside.cpp index eb604f01e64..4b9df185a37 100644 --- a/src/plugins/python/pyside.cpp +++ b/src/plugins/python/pyside.cpp @@ -5,7 +5,6 @@ #include "pipsupport.h" #include "pythonplugin.h" -#include "pythonsettings.h" #include "pythontr.h" #include "pythonutils.h" @@ -19,8 +18,8 @@ #include <utils/algorithm.h> #include <utils/async.h> #include <utils/infobar.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QRegularExpression> #include <QTextCursor> diff --git a/src/plugins/python/pysideuicextracompiler.cpp b/src/plugins/python/pysideuicextracompiler.cpp index c195aeaa1f7..45fb68066f9 100644 --- a/src/plugins/python/pysideuicextracompiler.cpp +++ b/src/plugins/python/pysideuicextracompiler.cpp @@ -3,7 +3,7 @@ #include "pysideuicextracompiler.h" -#include <utils/qtcprocess.h> +#include <utils/process.h> using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/python/pythonlanguageclient.cpp b/src/plugins/python/pythonlanguageclient.cpp index 6d3d7c8cfa7..9f347d8e486 100644 --- a/src/plugins/python/pythonlanguageclient.cpp +++ b/src/plugins/python/pythonlanguageclient.cpp @@ -31,7 +31,7 @@ #include <utils/async.h> #include <utils/infobar.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/variablechooser.h> #include <QCheckBox> diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp index 119bd9d2600..e5251384d2c 100644 --- a/src/plugins/python/pythonsettings.cpp +++ b/src/plugins/python/pythonsettings.cpp @@ -27,7 +27,7 @@ #include <utils/listmodel.h> #include <utils/layoutbuilder.h> #include <utils/pathchooser.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/treemodel.h> #include <utils/utilsicons.h> diff --git a/src/plugins/python/pythonutils.cpp b/src/plugins/python/pythonutils.cpp index 328ada95d95..0fb4d03f194 100644 --- a/src/plugins/python/pythonutils.cpp +++ b/src/plugins/python/pythonutils.cpp @@ -16,7 +16,7 @@ #include <utils/algorithm.h> #include <utils/mimeutils.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index c5d4b62a0d0..41ae75d8b9b 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -27,8 +27,8 @@ #include <qtsupport/qtkitinformation.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QCoreApplication> #include <QCryptographicHash> diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 102cb7e3ae7..794e134d5a8 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -28,8 +28,8 @@ #include <utils/macroexpander.h> #include <utils/outputformatter.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/variablechooser.h> #include <QCheckBox> diff --git a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp index 953768661d0..2d952513ab8 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp @@ -18,8 +18,8 @@ #include <qmljstools/qmljstoolsconstants.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtkitinformation.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QCryptographicHash> #include <QJSEngine> diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp index 7248143313e..ef0ef8e52ed 100644 --- a/src/plugins/qbsprojectmanager/qbssession.cpp +++ b/src/plugins/qbsprojectmanager/qbssession.cpp @@ -14,8 +14,8 @@ #include <projectexplorer/taskhub.h> #include <utils/algorithm.h> #include <utils/environment.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDir> #include <QEventLoop> diff --git a/src/plugins/qbsprojectmanager/qbssettings.cpp b/src/plugins/qbsprojectmanager/qbssettings.cpp index 6317580f685..91e4763bf25 100644 --- a/src/plugins/qbsprojectmanager/qbssettings.cpp +++ b/src/plugins/qbsprojectmanager/qbssettings.cpp @@ -12,7 +12,7 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/pathchooser.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QCoreApplication> #include <QCheckBox> diff --git a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp index 8c094c557a8..800d7350c19 100644 --- a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp +++ b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp @@ -13,8 +13,8 @@ #include <projectexplorer/target.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QCheckBox> #include <QComboBox> diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index 5fbab2084dd..990fd0ff417 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -5,7 +5,7 @@ #include <qtsupport/qtversionmanager.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDebug> #include <QDir> diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 779d175b80f..ce64ecd2d91 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -37,8 +37,8 @@ #include <qtsupport/qtkitinformation.h> #include <qtsupport/qtversionmanager.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDebug> #include <QInputDialog> diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index 0fdaecc3db5..ae35a9dc767 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp @@ -22,7 +22,7 @@ #include <projectexplorer/kitinformation.h> #include <projectexplorer/xcodebuildparser.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/variablechooser.h> #include <QDir> diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index 4786d2f07a9..31a55faab01 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -33,8 +33,8 @@ #include <utils/async.h> #include <utils/filesystemwatcher.h> #include <utils/mimeutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/temporarydirectory.h> diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index a78c001283f..2b73c154f6d 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -49,7 +49,7 @@ #include <utils/algorithm.h> #include <utils/async.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QDebug> #include <QDir> diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp index 8bcbe2027cf..1a929bf9a49 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp @@ -23,8 +23,8 @@ #include <qtsupport/qtversionmanager.h> #include <utils/algorithm.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDir> #include <QFileInfo> diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index d8e99a39a54..edcc0e40bb3 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -36,7 +36,7 @@ #include <utils/algorithm.h> #include <utils/hostosinfo.h> #include <utils/layoutbuilder.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/utilsicons.h> #include <utils/variablechooser.h> diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index f6ea4a8455f..10386425fe7 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -55,8 +55,8 @@ #include <utils/algorithm.h> #include <utils/fileutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include "utils/qtcprocess.h" #include <utils/smallstring.h> #include <QComboBox> diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 67674ed5e92..8ebfaf52044 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -75,8 +75,8 @@ #include <qmlprojectmanager/qmlproject.h> #include <utils/algorithm.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/theme/theme.h> #include <utils/threadutils.h> diff --git a/src/plugins/qmldesigner/generateresource.cpp b/src/plugins/qmldesigner/generateresource.cpp index 673ba41de4f..439e124b705 100644 --- a/src/plugins/qmldesigner/generateresource.cpp +++ b/src/plugins/qmldesigner/generateresource.cpp @@ -22,9 +22,9 @@ #include <qtsupport/qtkitinformation.h> #include <utils/fileutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> #include <utils/utilsicons.h> -#include <utils/qtcprocess.h> #include <QAction> #include <QByteArray> diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp index 6b886389e6f..ca43b07a42f 100644 --- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp +++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp @@ -18,7 +18,7 @@ #include <utils/filepath.h> #include <utils/port.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/url.h> using namespace ProjectExplorer; diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index f5c45789d8f..41b67edda78 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -20,8 +20,8 @@ #include <qmldebug/qmldebugcommandlinearguments.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/url.h> #include <QMessageBox> diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index aab0fcfe1c9..77e3cc82d40 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -38,8 +38,8 @@ #include <utils/algorithm.h> #include <utils/infobar.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDebug> #include <QLoggingCategory> diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 2c1a294e7a3..2ead9de6da9 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -41,7 +41,7 @@ #include <utils/fileutils.h> #include <utils/fsengine/fileiconprovider.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QAction> #include <QDesktopServices> diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 584bf8773b7..1cce1650ce0 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -34,7 +34,7 @@ #include <utils/aspects.h> #include <utils/environment.h> #include <utils/fileutils.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/winutils.h> #include <qmljstools/qmljstoolsconstants.h> diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp index 29ea42b7cdb..4d5a73b2ab5 100644 --- a/src/plugins/qnx/qnxanalyzesupport.cpp +++ b/src/plugins/qnx/qnxanalyzesupport.cpp @@ -9,8 +9,7 @@ #include <projectexplorer/devicesupport/deviceusedportsgatherer.h> -#include <utils/qtcassert.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <qmldebug/qmldebugcommandlinearguments.h> diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index d6ee8618980..919e9ef1fcc 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -33,9 +33,9 @@ #include <utils/fileutils.h> #include <utils/pathchooser.h> #include <utils/portlist.h> +#include <utils/process.h> #include <utils/processinfo.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDir> #include <QFormLayout> diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp index 6450223e431..aef2b0d0cd1 100644 --- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp +++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp @@ -16,9 +16,9 @@ #include <utils/algorithm.h> #include <utils/hostosinfo.h> #include <utils/layoutbuilder.h> +#include <utils/process.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QComboBox> #include <QDir> diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp index 49056d9ec40..306b87e861d 100644 --- a/src/plugins/qnx/qnxdevice.cpp +++ b/src/plugins/qnx/qnxdevice.cpp @@ -18,8 +18,8 @@ #include <utils/port.h> #include <utils/portlist.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/wizard.h> using namespace ProjectExplorer; diff --git a/src/plugins/qnx/qnxdevicetester.cpp b/src/plugins/qnx/qnxdevicetester.cpp index a96f5b6d7e7..cbead1aa3d6 100644 --- a/src/plugins/qnx/qnxdevicetester.cpp +++ b/src/plugins/qnx/qnxdevicetester.cpp @@ -6,8 +6,7 @@ #include "qnxconstants.h" #include "qnxtr.h" -#include <utils/qtcassert.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> using namespace Utils; diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp index 3cc73e6d54d..ba2c41b3453 100644 --- a/src/plugins/qnx/qnxutils.cpp +++ b/src/plugins/qnx/qnxutils.cpp @@ -5,7 +5,7 @@ #include <utils/algorithm.h> #include <utils/hostosinfo.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/temporaryfile.h> #include <QDebug> diff --git a/src/plugins/qnx/slog2inforunner.cpp b/src/plugins/qnx/slog2inforunner.cpp index 21de26e5a24..a6ceaab4ccb 100644 --- a/src/plugins/qnx/slog2inforunner.cpp +++ b/src/plugins/qnx/slog2inforunner.cpp @@ -8,8 +8,8 @@ #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/runconfigurationaspects.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QRegularExpression> diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index c08f296a8c2..179649c53b8 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -33,8 +33,8 @@ #include <utils/fileinprojectfinder.h> #include <utils/hostosinfo.h> #include <utils/macroexpander.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/winutils.h> diff --git a/src/plugins/qtsupport/externaleditors.cpp b/src/plugins/qtsupport/externaleditors.cpp index 9732693e6eb..dffd730d285 100644 --- a/src/plugins/qtsupport/externaleditors.cpp +++ b/src/plugins/qtsupport/externaleditors.cpp @@ -19,8 +19,8 @@ #include <utils/environment.h> #include <utils/filepath.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDebug> #include <QMap> diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index 37d141e11c6..3fc9fe8fed8 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -33,7 +33,7 @@ #include <utils/filepath.h> #include <utils/infobar.h> #include <utils/macroexpander.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> using namespace Core; using namespace Utils; diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index bde9d2e3374..eedc79e6864 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -21,8 +21,8 @@ #include <utils/filesystemwatcher.h> #include <utils/hostosinfo.h> #include <utils/persistentsettings.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDir> #include <QFile> diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp index f48a8d310ee..f1ff905b831 100644 --- a/src/plugins/qtsupport/uicgenerator.cpp +++ b/src/plugins/qtsupport/uicgenerator.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "uicgenerator.h" + #include "baseqtversion.h" #include "qtkitinformation.h" +#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/target.h> -#include <projectexplorer/buildconfiguration.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> -#include <QFileInfo> +#include <QDateTime> #include <QDir> +#include <QFileInfo> #include <QLoggingCategory> -#include <QDateTime> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/customcommanddeploystep.cpp b/src/plugins/remotelinux/customcommanddeploystep.cpp index 7249d2c6b2b..670390eeb19 100644 --- a/src/plugins/remotelinux/customcommanddeploystep.cpp +++ b/src/plugins/remotelinux/customcommanddeploystep.cpp @@ -11,7 +11,7 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfigurationaspects.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/remotelinux/filesystemaccess_test.cpp b/src/plugins/remotelinux/filesystemaccess_test.cpp index 24267b16bd9..00fdd82f367 100644 --- a/src/plugins/remotelinux/filesystemaccess_test.cpp +++ b/src/plugins/remotelinux/filesystemaccess_test.cpp @@ -11,8 +11,8 @@ #include <utils/filepath.h> #include <utils/filestreamer.h> #include <utils/filestreamermanager.h> +#include <utils/process.h> #include <utils/processinterface.h> -#include <utils/qtcprocess.h> #include <QDebug> #include <QFile> diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp index 4889dbb35d1..e4e3ed3801f 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.cpp +++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp @@ -15,9 +15,9 @@ #include <projectexplorer/target.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDateTime> diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index 6aca035bb6c..31980f6761e 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -29,9 +29,9 @@ #include <utils/hostosinfo.h> #include <utils/port.h> #include <utils/portlist.h> +#include <utils/process.h> #include <utils/processinfo.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> #include <utils/temporaryfile.h> diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp index c28b2ecfc50..39df7d9403f 100644 --- a/src/plugins/remotelinux/linuxdevicetester.cpp +++ b/src/plugins/remotelinux/linuxdevicetester.cpp @@ -10,9 +10,9 @@ #include <projectexplorer/devicesupport/filetransfer.h> #include <utils/algorithm.h> +#include <utils/process.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/stringutils.h> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp index e5641abec01..d1be1051452 100644 --- a/src/plugins/remotelinux/makeinstallstep.cpp +++ b/src/plugins/remotelinux/makeinstallstep.cpp @@ -20,8 +20,8 @@ #include <utils/algorithm.h> #include <utils/fileutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDirIterator> #include <QFileInfo> diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp index c5564d3c741..c7b4a548103 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp +++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp @@ -10,7 +10,7 @@ #include <projectexplorer/devicesupport/sshsettings.h> #include <utils/filepath.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/stringutils.h> #include <utils/theme/theme.h> diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp index 4ee28e77015..816e0e38696 100644 --- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp +++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp @@ -7,8 +7,8 @@ #include <utils/commandline.h> #include <utils/fileutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index 7a161601b75..b0779c01e2c 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -16,8 +16,8 @@ #include <projectexplorer/target.h> #include <utils/algorithm.h> +#include <utils/process.h> #include <utils/processinterface.h> -#include <utils/qtcprocess.h> #include <utils/tasktree.h> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/sshkeycreationdialog.cpp b/src/plugins/remotelinux/sshkeycreationdialog.cpp index 16dcf9220d7..441edab8898 100644 --- a/src/plugins/remotelinux/sshkeycreationdialog.cpp +++ b/src/plugins/remotelinux/sshkeycreationdialog.cpp @@ -10,7 +10,7 @@ #include <utils/fileutils.h> #include <utils/layoutbuilder.h> #include <utils/pathchooser.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QApplication> #include <QComboBox> diff --git a/src/plugins/remotelinux/tarpackagedeploystep.cpp b/src/plugins/remotelinux/tarpackagedeploystep.cpp index 4f517ea91de..a79209354aa 100644 --- a/src/plugins/remotelinux/tarpackagedeploystep.cpp +++ b/src/plugins/remotelinux/tarpackagedeploystep.cpp @@ -12,8 +12,8 @@ #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/projectexplorerconstants.h> +#include <utils/process.h> #include <utils/processinterface.h> -#include <utils/qtcprocess.h> using namespace ProjectExplorer; using namespace Utils; diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp index e2a85ab53c5..9ac9702a6e4 100644 --- a/src/plugins/silversearcher/findinfilessilversearcher.cpp +++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp @@ -9,8 +9,8 @@ #include <utils/async.h> #include <utils/environment.h> #include <utils/fileutils.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include "silversearcheroutputparser.h" #include "silversearchertr.h" diff --git a/src/plugins/squish/objectsmapdocument.cpp b/src/plugins/squish/objectsmapdocument.cpp index 0555bb3512c..3742ee3466d 100644 --- a/src/plugins/squish/objectsmapdocument.cpp +++ b/src/plugins/squish/objectsmapdocument.cpp @@ -10,7 +10,7 @@ #include "squishtr.h" #include <utils/fileutils.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QtCore5Compat/QTextCodec> diff --git a/src/plugins/squish/squishprocessbase.h b/src/plugins/squish/squishprocessbase.h index d8af2e9d4f2..6582c95062b 100644 --- a/src/plugins/squish/squishprocessbase.h +++ b/src/plugins/squish/squishprocessbase.h @@ -5,7 +5,7 @@ #include "squishconstants.h" -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QObject> diff --git a/src/plugins/squish/squishtools.h b/src/plugins/squish/squishtools.h index 19b57a7cb42..8d3cf61cfc5 100644 --- a/src/plugins/squish/squishtools.h +++ b/src/plugins/squish/squishtools.h @@ -9,7 +9,7 @@ #include "suiteconf.h" #include <utils/environment.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QObject> #include <QStringList> diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp index c9b28724eaa..45cd652381c 100644 --- a/src/plugins/subversion/subversionclient.cpp +++ b/src/plugins/subversion/subversionclient.cpp @@ -12,8 +12,7 @@ #include <utils/commandline.h> #include <utils/environment.h> #include <utils/hostosinfo.h> -#include <utils/qtcassert.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <vcsbase/vcsbaseconstants.h> #include <vcsbase/vcsbasediffeditorcontroller.h> diff --git a/src/plugins/terminal/shellintegration.h b/src/plugins/terminal/shellintegration.h index 8fce983b019..a4a813c8a65 100644 --- a/src/plugins/terminal/shellintegration.h +++ b/src/plugins/terminal/shellintegration.h @@ -5,7 +5,7 @@ #pragma once #include <utils/commandline.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <vterm.h> diff --git a/src/plugins/terminal/terminalwidget.h b/src/plugins/terminal/terminalwidget.h index f6ea7d763b9..4f56f39efe4 100644 --- a/src/plugins/terminal/terminalwidget.h +++ b/src/plugins/terminal/terminalwidget.h @@ -9,7 +9,7 @@ #include <aggregation/aggregate.h> #include <utils/link.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/terminalhooks.h> #include <QAbstractScrollArea> diff --git a/src/plugins/texteditor/formattexteditor.cpp b/src/plugins/texteditor/formattexteditor.cpp index 5f02b7e9d02..3e31006d617 100644 --- a/src/plugins/texteditor/formattexteditor.cpp +++ b/src/plugins/texteditor/formattexteditor.cpp @@ -12,8 +12,8 @@ #include <utils/async.h> #include <utils/differ.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporarydirectory.h> #include <utils/textutils.h> diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index 8ee3247010d..d6ec407f63b 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -13,8 +13,8 @@ #include <coreplugin/icore.h> #include <coreplugin/progressmanager/taskprogress.h> #include <utils/infobar.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDate> #include <QLabel> diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp index 2c2f73b10e5..99d948c2482 100644 --- a/src/plugins/valgrind/callgrindengine.cpp +++ b/src/plugins/valgrind/callgrindengine.cpp @@ -13,8 +13,8 @@ #include <utils/filepath.h> #include <utils/filestreamermanager.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporaryfile.h> #include <QDebug> diff --git a/src/plugins/valgrind/callgrindengine.h b/src/plugins/valgrind/callgrindengine.h index 13d04b63353..4ec6a16d7fa 100644 --- a/src/plugins/valgrind/callgrindengine.h +++ b/src/plugins/valgrind/callgrindengine.h @@ -8,7 +8,7 @@ #include "callgrind/callgrindparsedata.h" #include "callgrind/callgrindparser.h" -#include <utils/qtcprocess.h> +#include <utils/process.h> namespace Valgrind { namespace Internal { diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 9b35de452d4..ab5b0e55602 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -52,8 +52,8 @@ #include <projectexplorer/taskhub.h> #include <utils/fancymainwindow.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/styledbar.h> #include <utils/utilsicons.h> diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index b07288b175d..e0702ef9720 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -50,8 +50,8 @@ #include <utils/checkablemessagebox.h> #include <utils/fancymainwindow.h> #include <utils/pathchooser.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/utilsicons.h> #include <QAction> diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp index 3750217ad7c..ef78c7f9ffc 100644 --- a/src/plugins/valgrind/valgrindrunner.cpp +++ b/src/plugins/valgrind/valgrindrunner.cpp @@ -9,8 +9,8 @@ #include <projectexplorer/runcontrol.h> #include <utils/hostosinfo.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QEventLoop> #include <QTcpServer> diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index b781b1772ae..d5ec691ec04 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -21,8 +21,8 @@ #include <utils/commandline.h> #include <utils/environment.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDebug> #include <QStringList> diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp index aaea619a2b1..715b0855599 100644 --- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp +++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp @@ -8,8 +8,8 @@ #include <utils/async.h> #include <utils/environment.h> #include <utils/futuresynchronizer.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> using namespace DiffEditor; using namespace Utils; diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index dfd89842c52..517ffbdf48f 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -17,8 +17,8 @@ #include <projectexplorer/projectmanager.h> #include <projectexplorer/projecttree.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QAction> #include <QDebug> diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 0d9f92a702e..d9717ece09e 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -28,8 +28,8 @@ #include <utils/completingtextedit.h> #include <utils/fileutils.h> #include <utils/icon.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/temporarydirectory.h> #include <utils/theme/theme.h> diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp index a16545b70ba..885ff004dab 100644 --- a/src/plugins/vcsbase/vcscommand.cpp +++ b/src/plugins/vcsbase/vcscommand.cpp @@ -10,8 +10,8 @@ #include <utils/environment.h> #include <utils/globalfilechangeblocker.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/threadutils.h> #include <QTextCodec> diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp index 245de851346..2b5536809f8 100644 --- a/src/plugins/vcsbase/vcsoutputwindow.cpp +++ b/src/plugins/vcsbase/vcsoutputwindow.cpp @@ -14,7 +14,7 @@ #include <texteditor/texteditorsettings.h> #include <utils/filepath.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/theme/theme.h> #include <QAction> diff --git a/src/plugins/webassembly/webassemblyemsdk.cpp b/src/plugins/webassembly/webassemblyemsdk.cpp index e66df1272da..42f8738a8e7 100644 --- a/src/plugins/webassembly/webassemblyemsdk.cpp +++ b/src/plugins/webassembly/webassemblyemsdk.cpp @@ -7,7 +7,7 @@ #include <coreplugin/icore.h> #include <utils/environment.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/hostosinfo.h> #include <QCache> diff --git a/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp b/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp index 70484168ebe..05b7e89e821 100644 --- a/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp +++ b/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp @@ -8,8 +8,8 @@ #include <projectexplorer/target.h> #include <utils/layoutbuilder.h> +#include <utils/process.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QComboBox> #include <QTextStream> diff --git a/tests/auto/utils/commandline/tst_commandline.cpp b/tests/auto/utils/commandline/tst_commandline.cpp index c20eb48db91..2691b1e84ad 100644 --- a/tests/auto/utils/commandline/tst_commandline.cpp +++ b/tests/auto/utils/commandline/tst_commandline.cpp @@ -8,8 +8,8 @@ #include <utils/hostosinfo.h> #include <utils/launcherinterface.h> #include <utils/macroexpander.h> +#include <utils/process.h> #include <utils/processinterface.h> -#include <utils/qtcprocess.h> #include <utils/temporarydirectory.h> #include <QObject> diff --git a/tests/auto/utils/deviceshell/tst_deviceshell.cpp b/tests/auto/utils/deviceshell/tst_deviceshell.cpp index f94d0dc5b40..6e081495c36 100644 --- a/tests/auto/utils/deviceshell/tst_deviceshell.cpp +++ b/tests/auto/utils/deviceshell/tst_deviceshell.cpp @@ -8,7 +8,7 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/launcherinterface.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/temporarydirectory.h> #include <QObject> diff --git a/tests/auto/utils/qtcprocess/processtestapp/main.cpp b/tests/auto/utils/qtcprocess/processtestapp/main.cpp index 6851a3597cf..91952c2528e 100644 --- a/tests/auto/utils/qtcprocess/processtestapp/main.cpp +++ b/tests/auto/utils/qtcprocess/processtestapp/main.cpp @@ -6,7 +6,7 @@ #include <app/app_version.h> #include <utils/launcherinterface.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/temporarydirectory.h> #include <QCoreApplication> diff --git a/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp b/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp index 1fa73a94759..3905d0a22b5 100644 --- a/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp +++ b/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp @@ -3,7 +3,7 @@ #include "processtestapp.h" -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <QCoreApplication> #include <QDebug> diff --git a/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp index 1bc1778237d..657b3356068 100644 --- a/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp +++ b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp @@ -8,10 +8,10 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/launcherinterface.h> +#include <utils/process.h> #include <utils/processinfo.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <utils/singleton.h> #include <utils/stringutils.h> #include <utils/temporarydirectory.h> diff --git a/tests/manual/deviceshell/tst_deviceshell.cpp b/tests/manual/deviceshell/tst_deviceshell.cpp index 96638763f8e..99c506d1bda 100644 --- a/tests/manual/deviceshell/tst_deviceshell.cpp +++ b/tests/manual/deviceshell/tst_deviceshell.cpp @@ -6,7 +6,7 @@ #include <utils/deviceshell.h> #include <utils/environment.h> #include <utils/launcherinterface.h> -#include <utils/qtcprocess.h> +#include <utils/process.h> #include <utils/temporarydirectory.h> #include <QObject> |