diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-14 15:18:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-15 20:51:26 +0200 |
| commit | 5f160a3699d80d1736f691ad9ef774eb6aa28079 (patch) | |
| tree | 0df506211cd7ec17d8f9d89bf437ed0e594b1dcf /src/plugins/bearer/corewlan/corewlan.pro | |
| parent | 3026c0630dedb2fd8744e4cd9505f90c86b1a1cd (diff) | |
Fix static linking when bearer management plugins are built
The bearer plugins include copies of moc generated code that results in
duplicate symbols when static linking pulls in multiple bearer plugins.
Instead of relying on toolchain defined behavior, this patch moves the
code that is shared into the shared library as private API. This way it
will exist only once in memory and once at link time, resulting no
linking errors about duplicate symbols.
Fixes: QTBUG-79211
Change-Id: Iafa45c234e7fdd998971fc9cb7116334d08907bc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/plugins/bearer/corewlan/corewlan.pro')
| -rw-r--r-- | src/plugins/bearer/corewlan/corewlan.pro | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro index 1dc09ebdd6..4f08eaba71 100644 --- a/src/plugins/bearer/corewlan/corewlan.pro +++ b/src/plugins/bearer/corewlan/corewlan.pro @@ -7,12 +7,9 @@ qtConfig(corewlan) { LIBS += -framework CoreWLAN -framework Security } -HEADERS += qcorewlanengine.h \ - ../qnetworksession_impl.h \ - ../qbearerengine_impl.h +HEADERS += qcorewlanengine.h -SOURCES += main.cpp \ - ../qnetworksession_impl.cpp +SOURCES += main.cpp OBJECTIVE_SOURCES += qcorewlanengine.mm |