From 608c2501e559b4f8cd6fc80a04deeb771b6449ac Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Thu, 9 Mar 2023 15:24:10 +0100 Subject: [PATCH] Fix tst_qfreelist when build with unity Previous setup of the test was failing in minimal static build if built using the unity build because of the explicit inclusion of the qtcore source files. In order to resolve this, I removed the inclusion of qtcore's headers and made the test private. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Id1c7b3b65ca2078354c235a718ff3e93a65362e6 Reviewed-by: Joerg Bornemann --- tests/auto/corelib/tools/CMakeLists.txt | 4 +++- tests/auto/corelib/tools/qfreelist/CMakeLists.txt | 8 -------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tests/auto/corelib/tools/CMakeLists.txt b/tests/auto/corelib/tools/CMakeLists.txt index a10148269e..9bcdc12bfc 100644 --- a/tests/auto/corelib/tools/CMakeLists.txt +++ b/tests/auto/corelib/tools/CMakeLists.txt @@ -17,7 +17,9 @@ add_subdirectory(qduplicatetracker) add_subdirectory(qeasingcurve) add_subdirectory(qexplicitlyshareddatapointer) add_subdirectory(qflatmap) -add_subdirectory(qfreelist) +if(QT_FEATURE_private_tests) + add_subdirectory(qfreelist) +endif() add_subdirectory(qhash) add_subdirectory(qhashfunctions) add_subdirectory(qhashseed) diff --git a/tests/auto/corelib/tools/qfreelist/CMakeLists.txt b/tests/auto/corelib/tools/qfreelist/CMakeLists.txt index 498f638e64..383e8c38ee 100644 --- a/tests/auto/corelib/tools/qfreelist/CMakeLists.txt +++ b/tests/auto/corelib/tools/qfreelist/CMakeLists.txt @@ -11,11 +11,3 @@ qt_internal_add_test(tst_qfreelist LIBRARIES Qt::CorePrivate ) - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_qfreelist CONDITION NOT QT_FEATURE_private_tests - SOURCES - ../../../../../src/corelib/tools/qfreelist.cpp -)