Merge remote-tracking branch 'origin/api_changes'

Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1

1 files changed, 19 insertions, 0 deletions

diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index f434df177c..2131188439 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -387,6 +387,25 @@ void QTimer::setInterval(int msec)
 }
 
 /*!
+    \property QTimer::remainingTime
+    \brief the remaining time in milliseconds
+
+    Returns the timer's remaining value in milliseconds left until the timeout.
+    If the timer is inactive, the returned value will be -1. If the timer is
+    overdue, the returned value will be 0.
+
+    \sa interval
+*/
+int QTimer::remainingTime() const
+{
+    if (id != INV_TIMER) {
+        return QAbstractEventDispatcher::instance()->remainingTime(id);
+    }
+
+    return -1;
+}
+
+/*!
     \property QTimer::timerType
     \brief controls the accuracy of the timer