From d468e77af28f92c7d663c7b0cda87d2566314161 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Wed, 4 Jan 2023 16:29:39 +0200 Subject: [PATCH] QFileInfo: use currentDateTimeUtc() Instead of the more verbose currentDateTime(QTZ::UTC). Change-Id: Ie759f4270b12fca39c458bf85c8296f5342033db Reviewed-by: Thiago Macieira (cherry picked from commit 26b5325767a4084ca51f485b99ac58477246e062 with #include added to tst_qmimedatabase.cpp) --- tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp | 8 ++++---- .../corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp index 4b383c0c53b..d5d584c8ebd 100644 --- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp @@ -1129,7 +1129,7 @@ void tst_QFileInfo::fileTimes() QDateTime birthTime, writeTime, metadataChangeTime, readTime; // --- Create file and write to it - beforeBirth = QDateTime::currentDateTime().addMSecs(-fsClockSkew); + beforeBirth = QDateTime::currentDateTimeUtc().addMSecs(-fsClockSkew); { QFile file(fileName); QVERIFY(file.open(QFile::WriteOnly | QFile::Text)); @@ -1139,7 +1139,7 @@ void tst_QFileInfo::fileTimes() datePairString(birthTime, beforeBirth)); QTest::qSleep(sleepTime); - beforeWrite = QDateTime::currentDateTime().addMSecs(-fsClockSkew); + beforeWrite = QDateTime::currentDateTimeUtc().addMSecs(-fsClockSkew); QTextStream ts(&file); ts << fileName << Qt::endl; } @@ -1152,7 +1152,7 @@ void tst_QFileInfo::fileTimes() // --- Change the file's metadata QTest::qSleep(sleepTime); - beforeMetadataChange = QDateTime::currentDateTime().addMSecs(-fsClockSkew); + beforeMetadataChange = QDateTime::currentDateTimeUtc().addMSecs(-fsClockSkew); { QFile file(fileName); file.setPermissions(file.permissions()); @@ -1168,7 +1168,7 @@ void tst_QFileInfo::fileTimes() // --- Read the file QTest::qSleep(sleepTime); - beforeRead = QDateTime::currentDateTime().addMSecs(-fsClockSkew); + beforeRead = QDateTime::currentDateTimeUtc().addMSecs(-fsClockSkew); { QFile file(fileName); QVERIFY(file.open(QFile::ReadOnly | QFile::Text)); diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index 8c6bc73cdf4..293f31e4647 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -886,7 +886,7 @@ static bool waitAndRunUpdateMimeDatabase(const QString &path) QFileInfo mimeCacheInfo(path + QString::fromLatin1("/mime.cache")); if (mimeCacheInfo.exists()) { // Wait until the beginning of the next second - while (mimeCacheInfo.lastModified().secsTo(QDateTime::currentDateTime()) == 0) { + while (mimeCacheInfo.lastModified().secsTo(QDateTime::currentDateTimeUtc()) == 0) { QTest::qSleep(200); } }