diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-12 15:33:54 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-12 17:30:18 +0000 |
| commit | f2c57e83ab21f5f5ad01f309643821a8851493b5 (patch) | |
| tree | 59ca6ba88488e3f0af7d0f1898bda5ac8cba5aa5 | |
| parent | cb6f92c481a451bb8a7a26c8d933761896cf3884 (diff) | |
Revert "Fix static linking when using bearer plugins"
While the first patch that was required to fix duplicate symbols
errors was merged from dev to wip/cmake, the second one
7a605edc226d4051602e157fe575f17dfaac0964 is not yet merged.
So revert the revert to temporarily fix static builds until we do
another merge from dev to wip/cmake.
This reverts commit 307cd64c5726f93dbc91cafbce986875a6cce3e1
Task-number: Fixes: QTBUG-79211
Change-Id: I72052513fc0e0183b3ce8270b4ce3f2ff44b664d
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/plugins/bearer/connman/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/bearer/networkmanager/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index c1940a1e16..af2a599cb0 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -6,6 +6,7 @@ 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 f0748bebde..bbb1650140 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -6,6 +6,7 @@ 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 |