diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-07-20 13:21:34 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-22 10:04:29 +0000 |
| commit | 400fe7839e50705d71066e12245d4e64fd658e67 (patch) | |
| tree | 5f6997514cb816ede395682b1b81848cb8345633 | |
| parent | ee2a45db6b49cb1f4d4c57f529ec239b22c853ac (diff) | |
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 a3b58a7844f77bd416fad8307f8333ff7c0efacf
Amends d385158d5213ef568b7629e2aa4a818016bbffac
Fixes: QTBUG-95283
Change-Id: Idf78c78a1029f4d13fb460c07bef3d2669e55b09
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 91cc4fd6994701c87329de866333eb0bda0e37ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/networkinformation/networklistmanager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | 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 |