summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qtimer.cpp3
-rw-r--r--src/corelib/kernel/qtimer.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 9703d810ee9..93a2ad6d07d 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -290,7 +290,8 @@ void QTimer::timerEvent(QTimerEvent *e)
}
}
-static QAbstractEventDispatcher::Duration from_msecs(std::chrono::milliseconds ms)
+QAbstractEventDispatcher::Duration // statically asserts that Duration is nanoseconds
+QTimer::from_msecs(std::chrono::milliseconds ms)
{
using Duration = QAbstractEventDispatcher::Duration;
diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h
index 06e90ac52ef..cc4720a3d05 100644
--- a/src/corelib/kernel/qtimer.h
+++ b/src/corelib/kernel/qtimer.h
@@ -144,6 +144,8 @@ private:
Q_DECLARE_PRIVATE(QTimer)
friend class QChronoTimer;
+ static std::chrono::nanoseconds from_msecs(std::chrono::milliseconds);
+
inline int startTimer(int){ return -1;}
inline void killTimer(int){}