diff options
author | Andrew Knight <andrew.knight@digia.com> | 2013-12-10 15:31:38 +0200 |
---|---|---|
committer | Andrew Knight <andrew.knight@digia.com> | 2013-12-16 11:28:08 +0100 |
commit | fc781280a67530f308a56d053728f2d190d8bf22 (patch) | |
tree | d37cab890965d3474eb12771ce279616b25db0cb /src/compositor/wayland_wrapper/qwlcompositor.cpp | |
parent | fe0b9370bcd648ad65193f7b34dc387e653f4b71 (diff) |
Use QElapsedTimer for Compositor timer
Because it's the "Qt" thing to do.
Change-Id: Id85d1c3a51745d2c876b4337e90776628e79233a
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlcompositor.cpp')
-rw-r--r-- | src/compositor/wayland_wrapper/qwlcompositor.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/compositor/wayland_wrapper/qwlcompositor.cpp b/src/compositor/wayland_wrapper/qwlcompositor.cpp index 3a6b91b45..b77b9f398 100644 --- a/src/compositor/wayland_wrapper/qwlcompositor.cpp +++ b/src/compositor/wayland_wrapper/qwlcompositor.cpp @@ -150,6 +150,7 @@ Compositor::Compositor(QWaylandCompositor *qt_compositor, QWaylandCompositor::Ex , m_inputPanel() , m_retainNotify(0) { + m_timer.start(); compositor = this; #if defined (QT_COMPOSITOR_WAYLAND_GL) @@ -265,14 +266,9 @@ void Compositor::createSurface(struct wl_client *client, uint32_t id) m_qt_compositor->surfaceCreated(surface->waylandSurface()); } -uint Compositor::currentTimeMsecs() +uint Compositor::currentTimeMsecs() const { - //### we throw away the time information - struct timeval tv; - int ret = gettimeofday(&tv, 0); - if (ret == 0) - return tv.tv_sec*1000 + tv.tv_usec/1000; - return 0; + return m_timer.elapsed(); } void Compositor::releaseBuffer(QPlatformScreenBuffer *screenBuffer) |