diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-15 17:21:39 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-15 17:21:39 (GMT) |
| commit | f23bce37a8a3536bfedce7cc2d57f0761b2d1e31 (patch) | |
| tree | e7dd9c7f7724df3f12fe819321e44c63f4eb0c2c /examples | |
| parent | f41eac269d354ebeb797b9cb173b09fc996564cf (diff) | |
| parent | b832dffc1eb85181aa2d99afd1a6c764b634091d (diff) | |
| download | Qt-f23bce37a8a3536bfedce7cc2d57f0761b2d1e31.zip Qt-f23bce37a8a3536bfedce7cc2d57f0761b2d1e31.tar.gz Qt-f23bce37a8a3536bfedce7cc2d57f0761b2d1e31.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 2 | ||||
| -rw-r--r-- | examples/network/bearermonitor/sessionwidget.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 1fdd774..f233aba 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -19,7 +19,6 @@ SUBDIRS = \ linguist \ mainwindows \ painting \ - qtconcurrent \ richtext \ sql \ tools \ @@ -67,6 +66,7 @@ contains(QT_CONFIG, declarative): SUBDIRS += declarative win32: SUBDIRS += activeqt contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows +contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent # install sources.files = README *.pro diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp index ecc2a93..5ec9d53 100644 --- a/examples/network/bearermonitor/sessionwidget.cpp +++ b/examples/network/bearermonitor/sessionwidget.cpp @@ -107,7 +107,7 @@ void SessionWidget::updateSession() if (session->state() == QNetworkSession::Connected) statsTimer = startTimer(1000); - else + else if (statsTimer != -1) killTimer(statsTimer); if (session->configuration().type() == QNetworkConfiguration::InternetAccessPoint) |