diff options
Diffstat (limited to 'src/networksettings')
| -rw-r--r-- | src/networksettings/connman.pri | 1 | ||||
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.cpp | 3 | ||||
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.h | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/networksettings/connman.pri b/src/networksettings/connman.pri index 3f92830..957f2f0 100644 --- a/src/networksettings/connman.pri +++ b/src/networksettings/connman.pri @@ -1,7 +1,6 @@ QT += core network dbus INCLUDEPATH += $${PWD}/connman -DEFINES += QMAKE_BUILD DBUS_INTERFACES = \ connman/connman_manager.xml \ diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index 7c65018..3f594bd 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -34,9 +34,6 @@ #include "qnetworksettingsservicemodel.h" #include "qnetworksettingsuseragent.h" #include "moc_connman_manager_interface.cpp" -#ifdef QMAKE_BUILD -#include "connman_manager_interface.cpp" -#endif QT_BEGIN_NAMESPACE diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h index c199621..c696cdd 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.h +++ b/src/networksettings/connman/qnetworksettingsmanager_p.h @@ -46,9 +46,8 @@ #include "connmancommon.h" #include "qnetworksettingsmanager.h" #include "qnetworksettingsinterfacemodel.h" +#include "connman_manager_interface.h" -// Automatically generated class in global namespace -class NetConnmanManagerInterface; QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceModel) QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter) QT_FORWARD_DECLARE_CLASS(QNetworkSettingsService) |