diff options
| author | Eike Ziller <[email protected]> | 2024-02-27 16:08:45 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2024-02-28 08:09:05 +0000 |
| commit | 5af531cd39067366cea627e3db1a0b83d7172873 (patch) | |
| tree | 0759f3fe9a1924ebdc312d506162b90e21a90ca9 /src/plugins/debugger/cdb | |
| 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 <[email protected]>
Reviewed-by: <[email protected]>
Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins/debugger/cdb')
| -rw-r--r-- | src/plugins/debugger/cdb/cdbengine.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/debugger/cdb/cdbengine.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 7a428c6a857..48f6c8290c7 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -43,7 +43,7 @@ #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> #include <utils/stringutils.h> diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index 1cf499085e1..6d40bce2ffb 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -10,7 +10,7 @@ #include <projectexplorer/devicesupport/idevice.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <QElapsedTimer> |