Utils: Fix build with MSVC with C++20

Rename process.h back to qtcprocess.h

MSVC's "threads" standard header includes <process.h>, and that ends up
including our process.h from Utils.

There already was a hacky workaround in place for a similar issue with
MINGW, but that doesn't work with MSVC because that doesn't have

Simply use a name that doesn't conflict.

Change-Id: I1159cd2096b4f2dbc4a1728d0131dd6edd30ebd3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>

17 files changed, 19 insertions, 25 deletions

diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index d8fdc096854..b5a64e20541 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -17,7 +17,7 @@
 #include <utils/futuresynchronizer.h>
 #include <utils/hostosinfo.h>
 #include <utils/mimeutils.h>
-#include <utils/process.h>
+#include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcsettings.h>
 #include <utils/threadutils.h>
diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp
index 36f2cd802db..653fa8a7013 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/process.h>
+#include <utils/qtcprocess.h>
 
 #include <QDir>
 #include <QDirIterator>
diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index 7e7bb51ec5f..4db25ba7494 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -124,7 +124,6 @@ add_qtc_library(Utils
     port.cpp port.h
     portlist.cpp portlist.h
     predicates.h
-    process.cpp process.h
     processenums.h
     processhandle.cpp processhandle.h
     processhelper.cpp processhelper.h
@@ -137,6 +136,7 @@ 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/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index 3b54d11412b..2be40b6c9bf 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 "process.h"
+#include "qtcprocess.h"
 
 #include <QDebug>
 #include <QRegularExpression>
diff --git a/src/libs/utils/clangutils.cpp b/src/libs/utils/clangutils.cpp
index 6cf265820e7..4c8c7d801db 100644
--- a/src/libs/utils/clangutils.cpp
+++ b/src/libs/utils/clangutils.cpp
@@ -4,7 +4,7 @@
 #include "clangutils.h"
 
 #include "filepath.h"
-#include "process.h"
+#include "qtcprocess.h"
 #include "utilstr.h"
 
 #include <QVersionNumber>
diff --git a/src/libs/utils/datafromprocess.h b/src/libs/utils/datafromprocess.h
index 7cd833a9114..5acb220ba4e 100644
--- a/src/libs/utils/datafromprocess.h
+++ b/src/libs/utils/datafromprocess.h
@@ -7,7 +7,7 @@
 #include "commandline.h"
 #include "environment.h"
 #include "filepath.h"
-#include "process.h"
+#include "qtcprocess.h"
 
 #include <QDateTime>
 #include <QHash>
diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp
index c2475853e7a..50d1f276ef1 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 "process.h"
+#include "qtcprocess.h"
 #endif
 
 #include <QCoreApplication>
diff --git a/src/libs/utils/deviceshell.cpp b/src/libs/utils/deviceshell.cpp
index abccaa1b56b..69abc5ce4a4 100644
--- a/src/libs/utils/deviceshell.cpp
+++ b/src/libs/utils/deviceshell.cpp
@@ -3,7 +3,7 @@
 
 #include "deviceshell.h"
 
-#include "process.h"
+#include "qtcprocess.h"
 #include "processinterface.h"
 #include "qtcassert.h"
 #include "utilstr.h"
diff --git a/src/libs/utils/externalterminalprocessimpl.cpp b/src/libs/utils/externalterminalprocessimpl.cpp
index ca178d7bf9c..41b7259b8f5 100644
--- a/src/libs/utils/externalterminalprocessimpl.cpp
+++ b/src/libs/utils/externalterminalprocessimpl.cpp
@@ -4,7 +4,7 @@
 #include "externalterminalprocessimpl.h"
 
 #include "algorithm.h"
-#include "process.h"
+#include "qtcprocess.h"
 #include "terminalcommand.h"
 #include "utilstr.h"
 
diff --git a/src/libs/utils/filestreamer.cpp b/src/libs/utils/filestreamer.cpp
index 2fd40079242..663f505b881 100644
--- a/src/libs/utils/filestreamer.cpp
+++ b/src/libs/utils/filestreamer.cpp
@@ -4,7 +4,7 @@
 #include "filestreamer.h"
 
 #include "async.h"
-#include "process.h"
+#include "qtcprocess.h"
 
 #include <solutions/tasking/barrier.h>
 #include <solutions/tasking/tasktreerunner.h>
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 00b99e66719..9b2177fedb6 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -12,7 +12,7 @@
 #include "hostosinfo.h"
 #include "macroexpander.h"
 #include "optionpushbutton.h"
-#include "process.h"
+#include "qtcprocess.h"
 #include "qtcassert.h"
 #include "utilstr.h"
 
diff --git a/src/libs/utils/processinfo.cpp b/src/libs/utils/processinfo.cpp
index 499745473ee..0717bddbe9e 100644
--- a/src/libs/utils/processinfo.cpp
+++ b/src/libs/utils/processinfo.cpp
@@ -4,7 +4,7 @@
 #include "processinfo.h"
 
 #include "algorithm.h"
-#include "process.h"
+#include "qtcprocess.h"
 
 #include <QDir>
 #include <QRegularExpression>
diff --git a/src/libs/utils/process.cpp b/src/libs/utils/qtcprocess.cpp
index 5bf44513654..2ebc6b351d4 100644
--- a/src/libs/utils/process.cpp
+++ b/src/libs/utils/qtcprocess.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 "process.h"
+#include "qtcprocess.h"
 
 #include "algorithm.h"
 #include "environment.h"
@@ -2175,4 +2175,4 @@ void ProcessTaskAdapter::start()
 
 } // namespace Utils
 
-#include "process.moc"
+#include "qtcprocess.moc"
diff --git a/src/libs/utils/process.h b/src/libs/utils/qtcprocess.h
index 694c1a12a86..a7e00882a31 100644
--- a/src/libs/utils/process.h
+++ b/src/libs/utils/qtcprocess.h
@@ -1,11 +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
 
-#if defined(Q_CC_MINGW) && defined(WIN_PTHREADS_H) && !defined(_INC_PROCESS)
-  // Arrived here via <pthread.h> which wants to include <process.h>
-  #include_next <process.h>
-#elif !defined(UTILS_PROCESS_H)
-#define UTILS_PROCESS_H
+#pragma once
 
 #include "utils_global.h"
 
@@ -223,5 +219,3 @@ public:
 using ProcessTask = Tasking::CustomTask<ProcessTaskAdapter>;
 
 } // namespace Utils
-
-#endif // UTILS_PROCESS_H
diff --git a/src/libs/utils/terminalhooks.cpp b/src/libs/utils/terminalhooks.cpp
index 52bcc056295..3e5151e6f39 100644
--- a/src/libs/utils/terminalhooks.cpp
+++ b/src/libs/utils/terminalhooks.cpp
@@ -5,7 +5,7 @@
 
 #include "externalterminalprocessimpl.h"
 #include "filepath.h"
-#include "process.h"
+#include "qtcprocess.h"
 #include "utilstr.h"
 
 #include <QMutex>
diff --git a/src/libs/utils/unarchiver.h b/src/libs/utils/unarchiver.h
index b255cd49900..61818318bb7 100644
--- a/src/libs/utils/unarchiver.h
+++ b/src/libs/utils/unarchiver.h
@@ -6,7 +6,7 @@
 #include "utils_global.h"
 
 #include "commandline.h"
-#include "process.h"
+#include "qtcprocess.h"
 
 #include <solutions/tasking/tasktree.h>
 
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 348ee3e2661..c6dc3b79435 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -233,8 +233,8 @@ QtcLibrary {
         "portlist.cpp",
         "portlist.h",
         "predicates.h",
-        "process.cpp",
-        "process.h",
+        "qtcprocess.cpp",
+        "qtcprocess.h",
         "processenums.h",
         "processhandle.cpp",
         "processhandle.h",