From 13dd6788349857452c8e8ace9d3ae2a55fed9468 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 4 May 2023 15:07:18 +0200 Subject: [PATCH] Utils: Fix MinGW build Amends a0f6e8dc04291138ec2305fe7c02a0a460f57fac The issue is that pthread.h is including , which ends up to utils/process.h since it's first in path. Change-Id: I525384083b6952aded4b77c29d00d85f084c60f9 Reviewed-by: Jarek Kobus --- src/libs/utils/process.h | 8 +++++++- src/plugins/clangformat/CMakeLists.txt | 1 + src/plugins/vcpkg/CMakeLists.txt | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/process.h b/src/libs/utils/process.h index f89b6f9b22e..f11f3c3c41c 100644 --- a/src/libs/utils/process.h +++ b/src/libs/utils/process.h @@ -1,7 +1,11 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#pragma once +#if defined(Q_CC_MINGW) && defined(WIN_PTHREADS_H) && !defined(_INC_PROCESS) + // Arrived here via which wants to include + #include_next +#elif !defined(UTILS_PROCESS_H) +#define UTILS_PROCESS_H #include "utils_global.h" @@ -217,3 +221,5 @@ public: } // namespace Utils QTC_DECLARE_CUSTOM_TASK(ProcessTask, Utils::ProcessTaskAdapter); + +#endif // UTILS_PROCESS_H diff --git a/src/plugins/clangformat/CMakeLists.txt b/src/plugins/clangformat/CMakeLists.txt index 79767a2ffed..7c49e9ad47e 100644 --- a/src/plugins/clangformat/CMakeLists.txt +++ b/src/plugins/clangformat/CMakeLists.txt @@ -39,4 +39,5 @@ extend_qtc_plugin(ClangFormat tests/clangformat-test.h DEFINES TESTDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/tests/data" + EXPLICIT_MOC tests/clangformat-test.h ) diff --git a/src/plugins/vcpkg/CMakeLists.txt b/src/plugins/vcpkg/CMakeLists.txt index f5d65cf3937..d3fb8d00ed8 100644 --- a/src/plugins/vcpkg/CMakeLists.txt +++ b/src/plugins/vcpkg/CMakeLists.txt @@ -13,4 +13,5 @@ extend_qtc_plugin(Vcpkg CONDITION WITH_TESTS SOURCES vcpkg_test.cpp vcpkg_test.h + EXPLICIT_MOC vcpkg_test.h )