diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-21 10:09:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-24 13:00:07 +0000 |
| commit | 7a605edc226d4051602e157fe575f17dfaac0964 (patch) | |
| tree | 46a3c1f8328b9c7b1fd0a2863c2cea635f70d842 /src/plugins/bearer/connman | |
| parent | 6e3b5801d26dc186066155202847342782bf653b (diff) | |
Fix static linking when bearer management plugins are built, part 2
After commit 5f160a3699d80d1736f691ad9ef774eb6aa28079 moved the code
that's shared across all bearer management plugins into QtNetwork, there
is one piece of code remaining that's shared across the connman and the
networkmanager bearer plugin: The dbus ofono interface code. To avoid
linking that twice (and causing duplicate symbol errors), this patch
moves it into a static platform support library. This way for shared
builds the code is included twice, but for static builds only once.
Change-Id: Idf5414bc22fea45f11c600f28eaea91bb4dc6308
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/plugins/bearer/connman')
| -rw-r--r-- | src/plugins/bearer/connman/connman.pro | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/connman/qconnmanengine.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro index d6577e9d7f..03e94cfe6a 100644 --- a/src/plugins/bearer/connman/connman.pro +++ b/src/plugins/bearer/connman/connman.pro @@ -1,14 +1,12 @@ TARGET = qconnmanbearer -QT = core network-private dbus +QT = core network-private dbus linuxofono_support_private HEADERS += qconnmanservice_linux_p.h \ - ../linux_common/qofonoservice_linux_p.h \ qconnmanengine.h SOURCES += main.cpp \ qconnmanservice_linux.cpp \ - ../linux_common/qofonoservice_linux.cpp \ qconnmanengine.cpp OTHER_FILES += connman.json diff --git a/src/plugins/bearer/connman/qconnmanengine.h b/src/plugins/bearer/connman/qconnmanengine.h index eb79dbec1b..969eed45b1 100644 --- a/src/plugins/bearer/connman/qconnmanengine.h +++ b/src/plugins/bearer/connman/qconnmanengine.h @@ -54,7 +54,7 @@ #include <private/qbearerengine_impl_p.h> #include "qconnmanservice_linux_p.h" -#include "../linux_common/qofonoservice_linux_p.h" +#include <private/qofonoservice_linux_p.h> #include <QMap> #include <QVariant> |