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/baremetal | |
| 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/baremetal')
7 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp index e3d32b3d5c..521289650f 100644 --- a/src/plugins/baremetal/baremetaldebugsupport.cpp +++ b/src/plugins/baremetal/baremetaldebugsupport.cpp @@ -24,7 +24,7 @@ #include <projectexplorer/toolchain.h> #include <utils/portlist.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> using namespace Debugger; diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp index 56495e32c6..8d8a968c09 100644 --- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp @@ -9,7 +9,7 @@ #include <utils/fileutils.h> #include <utils/pathchooser.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> #include <utils/variablechooser.h> diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp index ff4ae311af..2ee3b266d7 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp @@ -9,7 +9,7 @@ #include <utils/fileutils.h> #include <utils/pathchooser.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> #include <utils/variablechooser.h> diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h index 2cce62f6c1..61bbe83f81 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/process.h> +#include <utils/qtcprocess.h> namespace Utils { class PathChooser; } diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index 4fa7dfe2e5..ef804b0a8a 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -16,7 +16,7 @@ #include <utils/algorithm.h> #include <utils/environment.h> #include <utils/pathchooser.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> #include <QDebug> diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index 50ae98178d..0ca7495c94 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -16,7 +16,7 @@ #include <utils/algorithm.h> #include <utils/environment.h> #include <utils/pathchooser.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> #include <QDebug> diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index 17130e861b..971fd9f13a 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -16,7 +16,7 @@ #include <utils/algorithm.h> #include <utils/environment.h> #include <utils/pathchooser.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> #include <QDebug> |