diff options
| author | hjk <hjk@qt.io> | 2021-05-05 18:21:22 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2021-05-10 09:47:51 +0000 |
| commit | c23cdd926262a977a987cd887be8f4fd02386d92 (patch) | |
| tree | 4b0a6dad23ed35fb4ce2fcb8d87f6254681a1629 /src/plugins/ios | |
| parent | 040d0cc1ef877a72b20717b193efa2104240db2b (diff) | |
Utils: Merge {synchronous,qtc}process.{h,cpp} file pairs
Mechanical to prepare merging the actual classes.
Adapting #includes.
Change-Id: I77a2c28129287778bc870c30cb890cd26bc2e62b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/ios')
| -rw-r--r-- | src/plugins/ios/iosconfigurations.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/ios/iosprobe.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/ios/iostoolhandler.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/ios/simulatorcontrol.cpp | 2 |
4 files changed, 14 insertions, 9 deletions
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 2997b37120d..ef6652fb9e3 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -31,10 +31,7 @@ #include "iosprobe.h" #include <coreplugin/icore.h> -#include <utils/algorithm.h> -#include <utils/synchronousprocess.h> -#include <utils/qtcassert.h> -#include <utils/synchronousprocess.h> + #include <projectexplorer/kitmanager.h> #include <projectexplorer/kitinformation.h> #include <projectexplorer/devicesupport/devicemanager.h> @@ -42,14 +39,20 @@ #include <projectexplorer/toolchain.h> #include <projectexplorer/gcctoolchain.h> #include <projectexplorer/projectexplorerconstants.h> + #include <debugger/debuggeritemmanager.h> #include <debugger/debuggeritem.h> #include <debugger/debuggerkitinformation.h> + #include <qtsupport/baseqtversion.h> #include <qtsupport/qtkitinformation.h> #include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionfactory.h> +#include <utils/algorithm.h> +#include <utils/qtcassert.h> +#include <utils/qtcprocess.h> + #include <QDir> #include <QDomDocument> #include <QFileInfo> diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp index 66518ad7788..12d5daae0d1 100644 --- a/src/plugins/ios/iosprobe.cpp +++ b/src/plugins/ios/iosprobe.cpp @@ -26,7 +26,7 @@ #include "iosprobe.h" #include <utils/algorithm.h> -#include <utils/synchronousprocess.h> +#include <utils/qtcprocess.h> #include <QDir> #include <QFileInfo> diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index a63fdb9dfa1..0d84f28c47a 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -29,12 +29,14 @@ #include "iossimulator.h" #include "simulatorcontrol.h" -#include "debugger/debuggerconstants.h" #include <coreplugin/icore.h> -#include <utils/qtcassert.h> + +#include <debugger/debuggerconstants.h> + #include <utils/fileutils.h> +#include <utils/qtcassert.h> +#include <utils/qtcprocess.h> #include <utils/runextensions.h> -#include <utils/synchronousprocess.h> #include <QCoreApplication> #include <QDir> diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp index 19dbe3c1bb2..b2464a3307e 100644 --- a/src/plugins/ios/simulatorcontrol.cpp +++ b/src/plugins/ios/simulatorcontrol.cpp @@ -29,7 +29,7 @@ #include <utils/algorithm.h> #include <utils/runextensions.h> #include <utils/qtcassert.h> -#include <utils/synchronousprocess.h> +#include <utils/qtcprocess.h> #ifdef Q_OS_MAC #include <CoreFoundation/CoreFoundation.h> |