3 files changed, 46 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index 533a27357c..f1619ab7c0 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -326,6 +326,44 @@ bool QNetworkConfiguration::isValid() const
 }
 
 /*!
+    \since 5.9
+
+    Returns the connect timeout of this configuration.
+
+    \sa setConnectTimeout
+*/
+int QNetworkConfiguration::connectTimeout() const
+{
+    if (!d)
+        return QNetworkConfigurationPrivate::DefaultTimeout;
+    QMutexLocker locker(&d->mutex);
+    return d->timeout;
+}
+
+/*!
+    \since 5.9
+
+    Sets the connect timeout of this configuration to \a timeout.
+    This allows control of the timeout used by \c QAbstractSocket
+    to establish a connection.
+
+    \warning This will have no effect if the bearer plugin doesn't have
+    the CanStartAndStopInterfaces capability.
+
+    Returns true if succeeded.
+
+    \sa connectTimeout
+*/
+bool QNetworkConfiguration::setConnectTimeout(int timeout)
+{
+    if (!d)
+        return false;
+    QMutexLocker locker(&d->mutex);
+    d->timeout = timeout;
+    return true;
+}
+
+/*!
     Returns the current state of the configuration.
 */
 QNetworkConfiguration::StateFlags QNetworkConfiguration::state() const
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index 208f9f4692..e7b74034fc 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -120,6 +120,9 @@ public:
     QString name() const;
     bool isValid() const;
 
+    int connectTimeout() const;
+    bool setConnectTimeout(int timeout);
+
 private:
     friend class QNetworkConfigurationPrivate;
     friend class QNetworkConfigurationManager;
diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h
index 12d9676b59..2fdb490ea0 100644
--- a/src/network/bearer/qnetworkconfiguration_p.h
+++ b/src/network/bearer/qnetworkconfiguration_p.h
@@ -69,7 +69,8 @@ public:
         type(QNetworkConfiguration::Invalid),
         purpose(QNetworkConfiguration::UnknownPurpose),
         bearerType(QNetworkConfiguration::BearerUnknown),
-        isValid(false), roamingSupported(false)
+        isValid(false), roamingSupported(false),
+        timeout(DefaultTimeout)
     {}
     virtual ~QNetworkConfigurationPrivate()
     {
@@ -91,6 +92,9 @@ public:
 
     bool isValid;
     bool roamingSupported;
+    int timeout;
+
+    static Q_CONSTEXPR int DefaultTimeout = 30000;
 
 private:
     Q_DISABLE_COPY(QNetworkConfigurationPrivate)