From 400fe7839e50705d71066e12245d4e64fd658e67 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 20 Jul 2021 13:21:34 +0200 Subject: CMake: Fix incorrect default plugin conditions on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The correct variable to check is WIN32 rather than WINDOWS. This affects which plugins get automatically linked in a static Qt build. Amends a3b58a7844f77bd416fad8307f8333ff7c0efacf Amends d385158d5213ef568b7629e2aa4a818016bbffac Fixes: QTBUG-95283 Change-Id: Idf78c78a1029f4d13fb460c07bef3d2669e55b09 Reviewed-by: Mårten Nordheim (cherry picked from commit 91cc4fd6994701c87329de866333eb0bda0e37ef) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/networkinformation/networklistmanager/CMakeLists.txt | 2 +- src/plugins/tls/schannel/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt index c4d5a5d494..1ffdfdec17 100644 --- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt @@ -2,7 +2,7 @@ qt_internal_add_plugin(QNLMNIPlugin OUTPUT_NAME networklistmanager CLASS_NAME QNetworkListManagerNetworkInformationBackendFactory TYPE networkinformation - DEFAULT_IF WINDOWS AND QT_FEATURE_networklistmanager + DEFAULT_IF WIN32 AND QT_FEATURE_networklistmanager SOURCES qnetworklistmanagernetworkinformationbackend.cpp LIBRARIES Qt::NetworkPrivate diff --git a/src/plugins/tls/schannel/CMakeLists.txt b/src/plugins/tls/schannel/CMakeLists.txt index 2930ceebca..b875e85de9 100644 --- a/src/plugins/tls/schannel/CMakeLists.txt +++ b/src/plugins/tls/schannel/CMakeLists.txt @@ -2,7 +2,7 @@ qt_internal_add_plugin(QSchannelBackendPlugin OUTPUT_NAME schannelbackend CLASS_NAME QSchannelBackend TYPE tls - DEFAULT_IF WINDOWS + DEFAULT_IF WIN32 SOURCES ../shared/qtlskey_base_p.h ../shared/qtlskey_base.cpp -- cgit v1.2.3