Merge remote-tracking branch 'origin/5.7' into 5.8

* origin/5.7:
  Rename main project file to match project name
  Fix compile error in qtdevicesettings
  Fix QNetworkSettingsManager usage from the C++
  Fix Wifi utils connection view
  Make bluetooth support optional
  Fix typo
  Remove unneeded include
  Use new style signals and slots connection
  Fix uninitialized variables
  Fix unused variable warning
  Fix deprecated QString warning
  Qt does not name getter functions with 'get'
  Fix compile errors: declaration of ‘<X>’ shadows a member of 'this'
  Fix compile error: No Qt keywords allowed in header files
  Fix compile error: 0 is not allowed for pointer initialization anymore

Conflicts:
	src/bluetoothsettings/bluetoothdevice.h
	src/bluetoothsettings/bluez/bluetoothdevice_p.h
	src/bluetoothsettings/discoverymodel.h
	src/displaysettings/displaysettings.h
	src/displaysettings/displaysettings_p.h
	src/localdevice/qlocaldevice.h
	src/localesettings/localemodel.h
	src/localesettings/systemlocale.h
	src/networksettings/connman/qnetworksettingsinterface_p.h
	src/networksettings/connman/qnetworksettingsservice_p.h
	src/networksettings/connman/qnetworksettingsuseragent_p.h
	src/networksettings/qnetworksettings.h
	src/networksettings/qnetworksettingsaddressmodel.h
	src/networksettings/qnetworksettingsinterface.h
	src/networksettings/qnetworksettingsinterfacemodel.h
	src/networksettings/qnetworksettingsmanager.h
	src/networksettings/qnetworksettingsservice.h
	src/networksettings/qnetworksettingsservicemodel.h
	src/networksettings/qnetworksettingsuseragent.h
	src/networksettings/wpasupplicant/qnetworksettingsservice_p.h
	src/timedatesettings/systemtime.h
	src/timedatesettings/timezonemodel.h

Change-Id: I7db3a24e41718e5951ec33336a1a4bd08b33e823

1 files changed, 5 insertions, 2 deletions

diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h
index cb42654..b6e23ab 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.h
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.h
@@ -38,6 +38,7 @@
 class NetConnmanManagerInterface;
 class QNetworkSettingsServiceModel;
 class QNetworkSettingsServiceFilter;
+class QNetworkSettingsService;
 
 class QNetworkSettingsManagerPrivate : public QObject
 {
@@ -47,13 +48,15 @@ public:
     explicit QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent);
     QNetworkSettingsManager *q_ptr;
     void setUserAgent(QNetworkSettingsUserAgent *agent);
-    QNetworkSettingsUserAgent *getUserAgent() {return m_agent;}
+    QNetworkSettingsUserAgent *userAgent() {return m_agent;}
 public slots:
     void getServicesFinished(QDBusPendingCallWatcher *watcher);
     void getTechnologiesFinished(QDBusPendingCallWatcher *watcher);
     void requestInput(const QString& service, const QString& type);
     void onServicesChanged(ConnmanMapStructList changed, const QList<QDBusObjectPath> &removed);
-
+    void serviceReady();
+private:
+    void handleNewService(const QString& servicePath);
 protected:
     QNetworkSettingsInterfaceModel m_interfaceModel;
     QNetworkSettingsServiceModel *m_serviceModel;