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/mcusupport | |
| 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/mcusupport')
| -rw-r--r-- | src/plugins/mcusupport/mcuqmlprojectnode.h | 2 | ||||
| -rw-r--r-- | src/plugins/mcusupport/mcusupportversiondetection.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/mcusupport/mcuqmlprojectnode.h b/src/plugins/mcusupport/mcuqmlprojectnode.h index bf40a696f6b..2a06e5cde55 100644 --- a/src/plugins/mcusupport/mcuqmlprojectnode.h +++ b/src/plugins/mcusupport/mcuqmlprojectnode.h @@ -9,7 +9,7 @@ #include <utils/filepath.h> #include <utils/osspecificaspects.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> diff --git a/src/plugins/mcusupport/mcusupportversiondetection.cpp b/src/plugins/mcusupport/mcusupportversiondetection.cpp index 56fe961569c..79c12cc9b3f 100644 --- a/src/plugins/mcusupport/mcusupportversiondetection.cpp +++ b/src/plugins/mcusupport/mcusupportversiondetection.cpp @@ -4,7 +4,7 @@ #include "mcusupportversiondetection.h" #include "mcuhelpers.h" -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <QDir> #include <QRegularExpression> |