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/texteditor | |
| 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/texteditor')
| -rw-r--r-- | src/plugins/texteditor/basefilefind.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/texteditor/formattexteditor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 399e275fe4..ce6d2f4999 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -21,7 +21,7 @@ #include <utils/algorithm.h> #include <utils/fadingindicator.h> #include <utils/futuresynchronizer.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> #include <QComboBox> diff --git a/src/plugins/texteditor/formattexteditor.cpp b/src/plugins/texteditor/formattexteditor.cpp index d4d1d61636..879387b991 100644 --- a/src/plugins/texteditor/formattexteditor.cpp +++ b/src/plugins/texteditor/formattexteditor.cpp @@ -12,7 +12,7 @@ #include <utils/async.h> #include <utils/differ.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcassert.h> #include <utils/temporarydirectory.h> #include <utils/textutils.h> |