From eca2d7d2586353633a59869715ecf460159cb799 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 21 Dec 2023 09:59:57 +0000 Subject: Remove temporary exclusion from unity build Commit db9fa4a61791794823e570f8aa7f6e5eed8c5f52 excluded qelapsedtimer_mac.cpp from the unity build. The necessary patches have been merged, and we can remove this exclusion from 6.6 on. Change-Id: I85b353b202af1fd8eeea43753e5dc5ce18357d19 Reviewed-by: Alexey Edelev (cherry picked from commit 75f5eec2c904b5a3a274d9f1c70e14e687e6fa29) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 95770f1bd3c86afbfee638f2957bcd3e994d7ebb) --- src/corelib/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 1bf524c6b2..96eb47dc35 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -592,8 +592,6 @@ qt_internal_extend_target(Core CONDITION APPLE # This makes sure that the tst_qmakelib passes. For some reason, # QtCore ends up returning a corrupted error message in # write_file(): fail - kernel/qelapsedtimer_mac.cpp # Temporary exclusion, until this, - # https://codereview.qt-project.org/c/qt/qtbase/+/462132, is merged ) qt_internal_extend_target(Core CONDITION MACOS -- cgit v1.2.3