From 518749701642b9d93773b5599e9a64ecbc640b9a Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Tue, 27 Mar 2018 17:56:25 +0300
Subject: Forward-port the improvement in passphrase error handling

Task-number: QTBUG-66280
Change-Id: I1c26e19907be99119bf9409c7269471c15b57bf8
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
---
 src/networksettings/connman/qnetworksettingsservice_p.cpp | 6 ++++++
 src/networksettings/connman/qnetworksettingsservice_p.h   | 1 +
 2 files changed, 7 insertions(+)

(limited to 'src/networksettings/connman')

diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp
index f7e6ef1..3912ec2 100644
--- a/src/networksettings/connman/qnetworksettingsservice_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp
@@ -326,6 +326,12 @@ void QNetworkSettingsServicePrivate::disconnectService()
 
 }
 
+void QNetworkSettingsServicePrivate::removeService()
+{
+    if (m_service)
+        m_service->Remove();
+}
+
 void QNetworkSettingsServicePrivate::setPlaceholderState(bool placeholderState)
 {
     m_placeholderState = placeholderState;
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.h b/src/networksettings/connman/qnetworksettingsservice_p.h
index 2e12179..362aea4 100644
--- a/src/networksettings/connman/qnetworksettingsservice_p.h
+++ b/src/networksettings/connman/qnetworksettingsservice_p.h
@@ -76,6 +76,7 @@ protected:
     void setupQNetworkSettingsProxy();
     void connectService();
     void disconnectService();
+    void removeService();
     void setPlaceholderState(bool placeholderState);
     bool placeholderState() const;
 
-- 
cgit v1.2.3