From ac5ceb289df7b44e7436d82db0ad22f0f4b8091b Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Tue, 4 Feb 2025 16:59:55 +0100 Subject: [PATCH] Make `FEATURE_static` and `FEATURE_shared` aliased features Fixes: QTBUG-133407 Pick-to: 6.8 Change-Id: Ic17315b0229a829689b77e272cd9bbd331c3b0d7 Reviewed-by: Alexandru Croitor (cherry picked from commit 2d271835679d1833b3ddd64bb5941bde2c6ad650) --- configure.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.cmake b/configure.cmake index e3b3c9da057..6881a02d542 100644 --- a/configure.cmake +++ b/configure.cmake @@ -519,15 +519,16 @@ qt_feature("android-style-assets" PRIVATE LABEL "Android Style Assets" CONDITION ANDROID ) -qt_feature("shared" PUBLIC +qt_feature_alias("shared" PUBLIC LABEL "Building shared libraries" - CONDITION BUILD_SHARED_LIBS + ALIAS_OF_CACHE BUILD_SHARED_LIBS ) qt_feature_definition("shared" "QT_STATIC" NEGATE PREREQUISITE "!defined(QT_SHARED) && !defined(QT_STATIC)") qt_feature_config("shared" QMAKE_PUBLIC_QT_CONFIG) qt_feature_config("shared" QMAKE_PUBLIC_CONFIG) -qt_feature("static" PUBLIC - CONDITION NOT QT_FEATURE_shared +qt_feature_alias("static" + ALIAS_OF_FEATURE "shared" + NEGATE ) qt_feature_config("static" QMAKE_PUBLIC_QT_CONFIG) qt_feature_config("static" QMAKE_PUBLIC_CONFIG)