summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2012-04-19 17:39:29 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2012-04-19 17:39:29 +1000
commitdafd44ec841d2f7cbd1d3a8f18e51faf339b798c (patch)
tree3ae1487157cd1fbbe7d693351ee357872137e532
parent30e45c584cffe914b0e2e26521c783d15c6177e0 (diff)
parent6f548eeb7a791fa77e65f347f5d5b202e5f67241 (diff)
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo: Fixing test failure of Aligned Timer from examples systeminfo application
-rw-r--r--src/systeminfo/qsystemalignedtimer_symbian.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/systeminfo/qsystemalignedtimer_symbian.cpp b/src/systeminfo/qsystemalignedtimer_symbian.cpp
index 12bbf57cdf..f77161abce 100644
--- a/src/systeminfo/qsystemalignedtimer_symbian.cpp
+++ b/src/systeminfo/qsystemalignedtimer_symbian.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -120,6 +120,7 @@ void QSystemAlignedTimerPrivate::singleShot(int minimumTime, int maximumTime, QO
TRACES(qDebug() << "QSystemAlignedTimerPrivate::singleShot--Issuing request,Wait for SingleShot() callback");
alignedTimer->m_singleShotReceiver = receiver;
alignedTimer->m_singleShotMember = member;
+ alignedTimer->setSingleShot(true);
alignedTimer->start(minimumTime, maximumTime);
}
}