From 0198611fd4505c617c004a418a75b17a44adeb00 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 24 Apr 2023 18:53:21 +0000 Subject: [PATCH] Revert "Exclude files from unity build" This reverts commit e0cec08480ab6a453e62b76666d5e24bef4f2ab0. Reason for revert: this can't possibly be the correct solution. It set properties in headers (not .cpp sources) and headers can't cause a build issue because they aren't built. Moreover, the problems were seen in another module, so the properties set in those files shouldn't even be visible to CMake. Change-Id: I8473bb819e768bd203f89034d18132186da0371c Pick-to: 6.5 Reviewed-by: Amir Masoud Abdol Reviewed-by: Joerg Bornemann --- src/corelib/CMakeLists.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 84423f400f..a1cb450627 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -550,14 +550,6 @@ qt_internal_extend_target(Core CONDITION WIN32 tools/qhash.cpp # Q_DECL_INIT_PRIORITY ) -qt_internal_extend_target(Core CONDITION LINUX - NO_UNITY_BUILD_SOURCES - # Some of the macros in X11.h and Xlib.h are colliding with - # symbols defined in some of the enums, e.g., None. - io/qurl.h - serialization/qjsonvalue.h -) - if(NOT WIN32) ### Qt7: remove # Make qwineventnotifier.h available on non-Windows platforms too for code bases that include