diff options
Diffstat (limited to 'src/plugins/bearer/networkmanager')
5 files changed, 54 insertions, 12 deletions
diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt new file mode 100644 index 0000000000..df5927024d --- /dev/null +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -0,0 +1,26 @@ +# Generated from networkmanager.pro. + +##################################################################### +## QNetworkManagerEnginePlugin Plugin: +##################################################################### + +qt_add_plugin(QNetworkManagerEnginePlugin + OUTPUT_NAME qnmbearer + CLASS_NAME QNetworkManagerEnginePlugin + TYPE bearer + SOURCES + main.cpp + qnetworkmanagerengine.cpp qnetworkmanagerengine.h + qnetworkmanagerservice.cpp qnetworkmanagerservice.h + LIBRARIES + Qt::LinuxOfonoSupportPrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus + Qt::LinuxOfonoSupport + Qt::Network +) + +#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>: +# OTHER_FILES = "networkmanager.json" diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt new file mode 100644 index 0000000000..8f26a4c86d --- /dev/null +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from networkmanager.pro. + +##################################################################### +## QNetworkManagerEnginePlugin Plugin: +##################################################################### + +qt_add_plugin(QNetworkManagerEnginePlugin + OUTPUT_NAME qnmbearer + TYPE bearer + SOURCES + main.cpp + qnetworkmanagerengine.cpp qnetworkmanagerengine.h + qnetworkmanagerservice.cpp qnetworkmanagerservice.h + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus + Qt::LinuxOfonoSupportPrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>: +# OTHER_FILES = "networkmanager.json" diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro index e71c93f66f..3ca217f974 100644 --- a/src/plugins/bearer/networkmanager/networkmanager.pro +++ b/src/plugins/bearer/networkmanager/networkmanager.pro @@ -1,18 +1,13 @@ TARGET = qnmbearer -QT = core network-private dbus +QT = core network-private dbus linuxofono_support_private HEADERS += qnetworkmanagerservice.h \ - qnetworkmanagerengine.h \ - ../linux_common/qofonoservice_linux_p.h \ - ../qnetworksession_impl.h \ - ../qbearerengine_impl.h + qnetworkmanagerengine.h SOURCES += main.cpp \ qnetworkmanagerservice.cpp \ - qnetworkmanagerengine.cpp \ - ../linux_common/qofonoservice_linux.cpp \ - ../qnetworksession_impl.cpp + qnetworkmanagerengine.cpp OTHER_FILES += networkmanager.json diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp index 85a9f9b9e0..cba2221587 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp @@ -39,7 +39,7 @@ #include "qnetworkmanagerengine.h" #include "qnetworkmanagerservice.h" -#include "../qnetworksession_impl.h" +#include <private/qnetworksession_impl_p.h> #include <QtNetwork/private/qnetworkconfiguration_p.h> @@ -53,7 +53,6 @@ #include <QDBusInterface> #include <QDBusMessage> #include <QDBusReply> -#include "../linux_common/qofonoservice_linux_p.h" #ifndef QT_NO_DBUS diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h index a95c68abdf..c624d6087d 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h @@ -51,11 +51,11 @@ // We mean it. // -#include "../qbearerengine_impl.h" +#include <private/qbearerengine_impl_p.h> #include "qnetworkmanagerservice.h" -#include "../linux_common/qofonoservice_linux_p.h" +#include <private/qofonoservice_linux_p.h> #include <QMap> #include <QVariant> |