From d4a79dba3bcfd7f263146ede63b409fab2a7cb78 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 16 Mar 2021 10:19:27 +0100 Subject: [PATCH] Fix qmake user projects for QT_LIBINFIX builds on Windows/iOS QMake user projects could not be built on Windows or iOS if Qt was configured with QT_LIBINFIX set. The code that generates qt_lib_entrypoint_private.pri file did not take into account the lib infix. Fixes: QTBUG-91511 Change-Id: Ibc40548a269238320f8f89a710d10e7f639246cb Reviewed-by: Alexandru Croitor (cherry picked from commit 7b4507d0be28d1258d5569182a03e8ead8620f2d) Reviewed-by: Qt Cherry-pick Bot --- src/entrypoint/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/entrypoint/CMakeLists.txt b/src/entrypoint/CMakeLists.txt index 801691b4e5c..5242337ee4d 100644 --- a/src/entrypoint/CMakeLists.txt +++ b/src/entrypoint/CMakeLists.txt @@ -94,7 +94,7 @@ if(using_entrypoint_library) set_target_properties(EntryPoint PROPERTIES INTERFACE_QT_MODULE_PRI_EXTRA_CONTENT " QT.entrypoint_implementation.name = QtEntryPointImplementation -QT.entrypoint_implementation.module = Qt6EntryPoint +QT.entrypoint_implementation.module = Qt6EntryPoint${QT_LIBINFIX} QT.entrypoint_implementation.ldflags = ${entrypoint_implementation_ldflags} QT.entrypoint_implementation.libs = $$QT_MODULE_LIB_BASE QT.entrypoint_implementation.module_config = staticlib v2 internal_module