diff options
author | Martin Petersson <martin.petersson@nokia.com> | 2011-04-27 12:36:53 +0200 |
---|---|---|
committer | Martin Petersson <martin.petersson@nokia.com> | 2011-05-02 12:39:40 +0200 |
commit | 5aaa38c7ac9370fa6f61581f4b5e57dd6d119ec0 (patch) | |
tree | 7a14bfbfeb6fd973d42e5295ae97bc8a2735eddb /src/network/bearer/qnetworkconfigmanager_p.h | |
parent | 5be54b220a9f9343f8442f7b2f3de50374e22061 (diff) |
QNetworkConfigurationManager: Fix network polling.
startPolling() is called by each engine, so before it would start
multiple singleshot timers. So I moved the timer to the class
and check if it has already been started before it is activated
again. So that we just use one timer.
Task-number: QTBUG-17219
Reviewed-by: Iiro Kause
Reviewed-by: Kranthi Kuntala
(cherry picked from commit 2506b86828ca8140c2f22d85a4378df40899b132)
Diffstat (limited to 'src/network/bearer/qnetworkconfigmanager_p.h')
-rw-r--r-- | src/network/bearer/qnetworkconfigmanager_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h index 81f38c5183..abc4b9b4fa 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.h +++ b/src/network/bearer/qnetworkconfigmanager_p.h @@ -64,6 +64,7 @@ QT_BEGIN_NAMESPACE class QBearerEngine; +class QTimer; class Q_NETWORK_EXPORT QNetworkConfigurationManagerPrivate : public QObject { @@ -107,6 +108,7 @@ private Q_SLOTS: private: void startPolling(); + QTimer *pollTimer; private: mutable QMutex mutex; |