diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2024-02-27 16:08:45 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2024-03-11 12:08:33 +0000 |
| commit | 3dbdad20dcb92b5bca757c4c4cebf09badb6bf00 (patch) | |
| tree | 722fda7455dc4c8c51f9e0727a3e82100f27b06b /src/plugins/qmlpreview | |
| parent | 3cc4e22cdc620a2f7c509d155eeddbf236ac8fa6 (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>
(cherry picked from commit 5af531cd39067366cea627e3db1a0b83d7172873)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/qmlpreview')
| -rw-r--r-- | src/plugins/qmlpreview/qmlpreviewruncontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp index 209bc06d1d3..17881d00bdc 100644 --- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp +++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp @@ -20,7 +20,7 @@ #include <utils/async.h> #include <utils/filepath.h> #include <utils/port.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/url.h> #include <QFutureWatcher> |