summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qtimer.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 8148ced222..49c57cb6ee 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -257,6 +257,7 @@ void QTimer::start()
void QTimer::start(int msec)
{
Q_D(QTimer);
+ d->inter.removeBindingUnlessInWrapper();
d->inter.setValueBypassingBindings(msec);
start();
d->inter.markDirty();
@@ -753,6 +754,8 @@ QBindable<bool> QTimer::bindableSingleShot()
void QTimer::setInterval(int msec)
{
Q_D(QTimer);
+ d->inter.removeBindingUnlessInWrapper();
+
d->inter.setValueBypassingBindings(msec);
if (d->id != INV_TIMER) { // create new timer
QObject::killTimer(d->id); // restart timer
@@ -760,6 +763,7 @@ void QTimer::setInterval(int msec)
// No need to call markDirty() for d->isActiveData here,
// as timer state actually does not change
}
+
d->inter.markDirty();
}