whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fix incorrect default plugin conditions on Windows 

The correct variable to check is WIN32 rather than WINDOWS.
This affects which plugins get automatically linked in a static
Qt build.

Amends a3b58a7844
Amends d385158d52

Pick-to: 6.1 6.2
Fixes: QTBUG-95283
Change-Id: Idf78c78a1029f4d13fb460c07bef3d2669e55b09
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Alexandru Croitor 2021-07-20 13:21:34 +02:00
parent fbf836657f
commit 91cc4fd699
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/networkinformation/networklistmanager/CMakeLists.txt
View File

@ -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

2
src/plugins/tls/schannel/CMakeLists.txt
View File

@ -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