diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-07 16:00:11 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-08 10:50:12 +0000 |
| commit | 307cd64c5726f93dbc91cafbce986875a6cce3e1 (patch) | |
| tree | 19d1edbd15b7427f51e22b807934d8586418a9d5 /src | |
| parent | 942d391b53a87ed8b313b48dbf57b2cedcd3e896 (diff) | |
Fix static linking when using bearer plugins
Now that 5f160a3699d80d1736f691ad9ef774eb6aa28079 is merged to
wip/cmake, we should be able to remove the previous workaround of not
linking in the bearer plugins.
Reverts 78b89547ad00153a8e02553a2e87d45415bd2314.
Fixes: QTBUG-79211
Change-Id: Iaa6633bd74d51ceeed9fa1ffb536445ef817764b
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/bearer/connman/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/bearer/networkmanager/CMakeLists.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index 9e8bab82ae..ff368dd693 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -6,7 +6,6 @@ add_qt_plugin(qconnmanbearer TYPE bearer - DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index efecd3c1f5..171250233e 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -6,7 +6,6 @@ add_qt_plugin(qnmbearer TYPE bearer - DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin SOURCES ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h |