diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-17 10:02:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-17 16:56:23 +0000 |
| commit | 4df389eb4f1ae10284c03023e923ce2164d46753 (patch) | |
| tree | 0bf380793f86b06cc92c3dcb12d858e199c7cd7d /src/plugins/bearer/connman | |
| parent | 02164e0288f714f1ea93afb32548548686773d1d (diff) | |
Re-generate affected cmake files and configure.json after the merge
This also removes the workarounds of commit
b2662b05dd078c46b82f5f041f51b0b83554113d now that it's fixed "upstream"
in the .pro files.
Change-Id: Idd5e6273873a700fcda5a6cad2039c4e88b61f6f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/bearer/connman')
| -rw-r--r-- | src/plugins/bearer/connman/.prev_CMakeLists.txt | 25 | ||||
| -rw-r--r-- | src/plugins/bearer/connman/CMakeLists.txt | 3 |
2 files changed, 25 insertions, 3 deletions
diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt new file mode 100644 index 0000000000..ff368dd693 --- /dev/null +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -0,0 +1,25 @@ +# Generated from connman.pro. + +##################################################################### +## qconnmanbearer Plugin: +##################################################################### + +add_qt_plugin(qconnmanbearer + TYPE bearer + CLASS_NAME QConnmanEnginePlugin + SOURCES + ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h + main.cpp + qconnmanengine.cpp qconnmanengine.h + qconnmanservice_linux.cpp qconnmanservice_linux_p.h + LIBRARIES + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus + Qt::Network +) + +#### Keys ignored in scope 1:.:.:connman.pro:<TRUE>: +# OTHER_FILES = "connman.json" +# _LOADED = "qt_plugin" diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index cadd67bbce..ff368dd693 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -6,12 +6,9 @@ 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 - ../qbearerengine_impl.h - ../qnetworksession_impl.cpp ../qnetworksession_impl.h main.cpp qconnmanengine.cpp qconnmanengine.h qconnmanservice_linux.cpp qconnmanservice_linux_p.h |