mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-06-27 16:07:46 -04:00
Use QTime instead of QElapsedTimer with Qt 4.6.
The latter has been introduced in Qt 4.7.
This commit is contained in:
parent
138ca8d3a3
commit
0bac9752ba
1 changed files with 10 additions and 1 deletions
|
@ -18,12 +18,17 @@
|
||||||
#include "Tools.h"
|
#include "Tools.h"
|
||||||
|
|
||||||
#include <QtCore/QCoreApplication>
|
#include <QtCore/QCoreApplication>
|
||||||
#include <QtCore/QElapsedTimer>
|
|
||||||
#include <QtCore/QIODevice>
|
#include <QtCore/QIODevice>
|
||||||
#include <QtCore/QLocale>
|
#include <QtCore/QLocale>
|
||||||
#include <QtCore/QStringList>
|
#include <QtCore/QStringList>
|
||||||
#include <QtGui/QImageReader>
|
#include <QtGui/QImageReader>
|
||||||
|
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
|
||||||
|
#include <QtCore/QElapsedTimer>
|
||||||
|
#else
|
||||||
|
#include <QtCore/QTime>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
#include <windows.h> // for Sleep()
|
#include <windows.h> // for Sleep()
|
||||||
#endif
|
#endif
|
||||||
|
@ -162,7 +167,11 @@ void wait(int ms)
|
||||||
{
|
{
|
||||||
Q_ASSERT(ms > 0);
|
Q_ASSERT(ms > 0);
|
||||||
|
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
|
||||||
QElapsedTimer timer;
|
QElapsedTimer timer;
|
||||||
|
#else
|
||||||
|
QTime timer;
|
||||||
|
#endif
|
||||||
timer.start();
|
timer.start();
|
||||||
|
|
||||||
if (ms <= 50) {
|
if (ms <= 50) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue