Merge branch '4.8'

Conflicts:
	doc/src/declarative/whatsnew.qdoc
	doc/src/examples/orientation.qdoc
	doc/src/examples/webftpclient.qdoc
	examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg
	src/corelib/global/qglobal.cpp
	src/gui/text/qglyphs.cpp
	src/gui/text/qplatformfontdatabase_qpa.cpp

1 files changed, 12 insertions, 2 deletions

diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index c108ad3..e9b6703 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -60,7 +60,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
 #endif
 
 QNetworkConfigurationManagerPrivate::QNetworkConfigurationManagerPrivate()
-    : QObject(), mutex(QMutex::Recursive), forcedPolling(0), firstUpdate(true)
+    : QObject(), pollTimer(0), mutex(QMutex::Recursive), forcedPolling(0), firstUpdate(true)
 {
     qRegisterMetaType<QNetworkConfiguration>("QNetworkConfiguration");
     qRegisterMetaType<QNetworkConfigurationPrivatePointer>("QNetworkConfigurationPrivatePointer");
@@ -442,9 +442,19 @@ void QNetworkConfigurationManagerPrivate::startPolling()
 {
     QMutexLocker locker(&mutex);
 
+    if(!pollTimer) {
+        pollTimer = new QTimer(this);
+        pollTimer->setInterval(10000);
+        pollTimer->setSingleShot(true);
+        connect(pollTimer, SIGNAL(timeout()), this, SLOT(pollEngines()));
+    }
+
+    if(pollTimer->isActive())
+        return;
+
     foreach (QBearerEngine *engine, sessionEngines) {
         if (engine->requiresPolling() && (forcedPolling || engine->configurationsInUse())) {
-            QTimer::singleShot(10000, this, SLOT(pollEngines()));
+            pollTimer->start();
             break;
         }
     }