diff options
author | Eike Ziller <eike.ziller@qt.io> | 2024-02-27 16:08:45 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2024-02-28 08:09:05 +0000 |
commit | 5af531cd39067366cea627e3db1a0b83d7172873 (patch) | |
tree | 0759f3fe9a1924ebdc312d506162b90e21a90ca9 /src/plugins/nim | |
parent | a8414effd8ff6cd9c32c8466950ac3b9b9561524 (diff) |
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>
Diffstat (limited to 'src/plugins/nim')
-rw-r--r-- | src/plugins/nim/project/nimblebuildsystem.cpp | 2 | ||||
-rw-r--r-- | src/plugins/nim/project/nimcompilerbuildstep.cpp | 2 | ||||
-rw-r--r-- | src/plugins/nim/project/nimtoolchain.cpp | 2 | ||||
-rw-r--r-- | src/plugins/nim/suggest/server.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/nim/project/nimblebuildsystem.cpp b/src/plugins/nim/project/nimblebuildsystem.cpp index baed02b525..91f4eb2f20 100644 --- a/src/plugins/nim/project/nimblebuildsystem.cpp +++ b/src/plugins/nim/project/nimblebuildsystem.cpp @@ -10,7 +10,7 @@ #include <projectexplorer/taskhub.h> #include <utils/algorithm.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> using namespace ProjectExplorer; diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index af730b4c85..aaf6ff4296 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -16,7 +16,7 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> #include <QComboBox> diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp index 61362314d7..8003659264 100644 --- a/src/plugins/nim/project/nimtoolchain.cpp +++ b/src/plugins/nim/project/nimtoolchain.cpp @@ -16,7 +16,7 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/pathchooser.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> #include <QFormLayout> diff --git a/src/plugins/nim/suggest/server.h b/src/plugins/nim/suggest/server.h index 73e28096e2..15fd2b04ad 100644 --- a/src/plugins/nim/suggest/server.h +++ b/src/plugins/nim/suggest/server.h @@ -3,7 +3,7 @@ #pragma once -#include <utils/process.h> +#include <utils/qtcprocess.h> namespace Nim::Suggest { |