diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2023-12-21 09:59:57 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-16 20:55:35 +0000 |
| commit | eca2d7d2586353633a59869715ecf460159cb799 (patch) | |
| tree | 3792bbf8eadfaa9d4aee2fc216d60749549c787e | |
| parent | 866733484e45f77c2e8a242a3ee592368855c027 (diff) | |
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 <alexey.edelev@qt.io>
(cherry picked from commit 75f5eec2c904b5a3a274d9f1c70e14e687e6fa29)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 95770f1bd3c86afbfee638f2957bcd3e994d7ebb)
| -rw-r--r-- | src/corelib/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 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 |