diff options
| author | Eike Ziller <[email protected]> | 2024-02-27 16:08:45 +0100 |
|---|---|---|
| committer | Tim Jenssen <[email protected]> | 2024-03-11 12:08:33 +0000 |
| commit | 3dbdad20dcb92b5bca757c4c4cebf09badb6bf00 (patch) | |
| tree | 722fda7455dc4c8c51f9e0727a3e82100f27b06b /src/plugins/qmlprojectmanager/qmlprojectplugin.cpp | |
| 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 <[email protected]>
Reviewed-by: <[email protected]>
Reviewed-by: hjk <[email protected]>
(cherry picked from commit 5af531cd39067366cea627e3db1a0b83d7172873)
Reviewed-by: Tim Jenssen <[email protected]>
Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectplugin.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index cd2910ec7fe..62abce5fe96 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -50,7 +50,7 @@ #include <utils/fileutils.h> #include <utils/fsengine/fileiconprovider.h> #include <utils/mimeconstants.h> -#include <utils/process.h> +#include <utils/qtcprocess.h> #include <utils/qtcsettings.h> #include <QAction> |