From 0bac9752baeb1b49b29aea38491ffe9a1c4de5a8 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sun, 5 Aug 2012 19:19:01 +0200 Subject: [PATCH] Use QTime instead of QElapsedTimer with Qt 4.6. The latter has been introduced in Qt 4.7. --- src/core/Tools.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp index 74c801754..752995d3c 100644 --- a/src/core/Tools.cpp +++ b/src/core/Tools.cpp @@ -18,12 +18,17 @@ #include "Tools.h" #include -#include #include #include #include #include +#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) +#include +#else +#include +#endif + #ifdef Q_OS_WIN #include // for Sleep() #endif @@ -162,7 +167,11 @@ void wait(int ms) { Q_ASSERT(ms > 0); +#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) QElapsedTimer timer; +#else + QTime timer; +#endif timer.start(); if (ms <= 50) {