summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-10-14 15:53:00 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-10-18 14:48:21 +0000
commit78b89547ad00153a8e02553a2e87d45415bd2314 (patch)
treec67c34b4dcc96c148ea35683323ec103783d4a91 /src/plugins/bearer
parentbb7fa0b9a006161f7cf63833595191865db69bc5 (diff)
Temporarily disable automatic static linking of bearer plugins
The bearer plugins cause duplicate symbol errors when linking executables in a static build. Re-apply commit b2662b05dd078c46b82f5f041f51b0b83554113d Task-number: QTBUG-79211 Change-Id: Ie4c1359f1f4d649a22570a31634c94fd22102730 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r--src/plugins/bearer/connman/CMakeLists.txt1
-rw-r--r--src/plugins/bearer/networkmanager/CMakeLists.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt
index ff368dd693..9e8bab82ae 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 171250233e..efecd3c1f5 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