1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename target of the BSTR test in QtCore to avoid conflict

Browse Source 
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 <thiago.macieira@intel.com>
Reviewed-by: Pavel Dubsky <pavel.dubsky@qt.io>
(cherry picked from commit 43a54cbe82a59a32ae666ddd0cc54e5edd0ccf50)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2024-07-09 12:09:46 +02:00 committed by Qt Cherry-pick Bot
parent 0c3ebbc037
commit d383391990
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/platform/windows/qbstr/CMakeLists.txt
View File

@ -7,7 +7,7 @@ if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
endif() endif()
qt_internal_add_test(tst_qbstr qt_internal_add_test(tst_qbstr_core
SOURCES SOURCES
tst_qbstr.cpp tst_qbstr.cpp
LIBRARIES LIBRARIES