diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt index 052a920cca9..da747f7673b 100644 --- a/src/libs/utils/CMakeLists.txt +++ b/src/libs/utils/CMakeLists.txt @@ -131,10 +131,10 @@ add_qtc_library(Utils process.cpp process.h processenums.h processhandle.cpp processhandle.h + processhelper.cpp processhelper.h processinfo.cpp processinfo.h processinterface.cpp processinterface.h processreaper.cpp processreaper.h - processutils.cpp processutils.h progressindicator.cpp progressindicator.h projectintropage.cpp projectintropage.h proxyaction.cpp proxyaction.h diff --git a/src/libs/utils/process.cpp b/src/libs/utils/process.cpp index 2474c0b1ffd..dede5bb4dc2 100644 --- a/src/libs/utils/process.cpp +++ b/src/libs/utils/process.cpp @@ -9,8 +9,8 @@ #include "hostosinfo.h" #include "launcherinterface.h" #include "launchersocket.h" +#include "processhelper.h" #include "processreaper.h" -#include "processutils.h" #include "stringutils.h" #include "terminalhooks.h" #include "threadutils.h" diff --git a/src/libs/utils/processutils.cpp b/src/libs/utils/processhelper.cpp similarity index 99% rename from src/libs/utils/processutils.cpp rename to src/libs/utils/processhelper.cpp index 3e037f393fa..2ca23fe138d 100644 --- a/src/libs/utils/processutils.cpp +++ b/src/libs/utils/processhelper.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "processutils.h" +#include "processhelper.h" #ifdef Q_OS_WIN #ifdef QTCREATOR_PCH_H diff --git a/src/libs/utils/processutils.h b/src/libs/utils/processhelper.h similarity index 98% rename from src/libs/utils/processutils.h rename to src/libs/utils/processhelper.h index 3ddc967317c..a4efc17ae51 100644 --- a/src/libs/utils/processutils.h +++ b/src/libs/utils/processhelper.h @@ -5,7 +5,6 @@ #include "processenums.h" -#include #include namespace Utils { diff --git a/src/libs/utils/processreaper.cpp b/src/libs/utils/processreaper.cpp index b161aee7fcf..0448d91c017 100644 --- a/src/libs/utils/processreaper.cpp +++ b/src/libs/utils/processreaper.cpp @@ -2,7 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "processreaper.h" -#include "processutils.h" + +#include "processhelper.h" #include "qtcassert.h" #include "threadutils.h" diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index ca8d616dd2c..48003c465cb 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -239,14 +239,14 @@ QtcLibrary { "processenums.h", "processhandle.cpp", "processhandle.h", + "processhelper.cpp", + "processhelper.h", "processinfo.cpp", "processinfo.h", "processinterface.cpp", "processinterface.h", "processreaper.cpp", "processreaper.h", - "processutils.cpp", - "processutils.h", "progressindicator.cpp", "progressindicator.h", "projectintropage.cpp", diff --git a/src/tools/processlauncher/CMakeLists.txt b/src/tools/processlauncher/CMakeLists.txt index 11149814ab8..d866bc9a8d4 100644 --- a/src/tools/processlauncher/CMakeLists.txt +++ b/src/tools/processlauncher/CMakeLists.txt @@ -14,10 +14,10 @@ add_qtc_executable(qtcreator_processlauncher ${UTILSDIR}/launcherpackets.cpp ${UTILSDIR}/launcherpackets.h ${UTILSDIR}/processenums.h + ${UTILSDIR}/processhelper.cpp + ${UTILSDIR}/processhelper.h ${UTILSDIR}/processreaper.cpp ${UTILSDIR}/processreaper.h - ${UTILSDIR}/processutils.cpp - ${UTILSDIR}/processutils.h ${UTILSDIR}/qtcassert.cpp ${UTILSDIR}/qtcassert.h ${UTILSDIR}/singleton.cpp diff --git a/src/tools/processlauncher/launchersockethandler.cpp b/src/tools/processlauncher/launchersockethandler.cpp index c7879dc7cc6..139fc2f67b9 100644 --- a/src/tools/processlauncher/launchersockethandler.cpp +++ b/src/tools/processlauncher/launchersockethandler.cpp @@ -4,8 +4,8 @@ #include "launchersockethandler.h" #include "launcherlogging.h" +#include #include -#include #include #include diff --git a/src/tools/processlauncher/processlauncher.qbs b/src/tools/processlauncher/processlauncher.qbs index 750276396c2..ca2973cd952 100644 --- a/src/tools/processlauncher/processlauncher.qbs +++ b/src/tools/processlauncher/processlauncher.qbs @@ -31,10 +31,10 @@ QtcTool { "launcherpackets.cpp", "launcherpackets.h", "processenums.h", + "processhelper.cpp", + "processhelper.h", "processreaper.cpp", "processreaper.h", - "processutils.cpp", - "processutils.h", "qtcassert.cpp", "qtcassert.h", "singleton.cpp",