From d3833919909f1f8cc4b9e32b34745500b6ffbb48 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 9 Jul 2024 12:09:46 +0200 Subject: [PATCH] Rename target of the BSTR test in QtCore to avoid conflict ActiveQt already has a tst_bstr, so configure fails for top-level builds with both Core and ActiveQt. Amends 93686386c078e2be03fb8bc42dee60a9e36fc23f. Task-number: QTBUG-126530 Change-Id: I4a3d67d72be14202fe487f241ecd3d7c97936e29 Reviewed-by: Thiago Macieira Reviewed-by: Pavel Dubsky (cherry picked from commit 43a54cbe82a59a32ae666ddd0cc54e5edd0ccf50) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/corelib/platform/windows/qbstr/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/platform/windows/qbstr/CMakeLists.txt b/tests/auto/corelib/platform/windows/qbstr/CMakeLists.txt index 75944948625..12ea7fc8d65 100644 --- a/tests/auto/corelib/platform/windows/qbstr/CMakeLists.txt +++ b/tests/auto/corelib/platform/windows/qbstr/CMakeLists.txt @@ -7,7 +7,7 @@ if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) endif() -qt_internal_add_test(tst_qbstr +qt_internal_add_test(tst_qbstr_core SOURCES tst_qbstr.cpp LIBRARIES