From c34e457bf9506ca068491eda41467013b180e544 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 10 Sep 2019 09:42:22 +0200 Subject: [KConfig] port away from deprecated methods in Qt 5.14 Summary: In kconf_update, the ctime usage used to be about metadata change time (buff.st_ctime, before it got ported to the misnamed created()). I ported it to birthTime, because I think date of birth is a more useful way to identify a file than date of permission change which doesn't really matter to us. But in practice, I can't help but wonder if mtime alone wouldn't be enough. For the QStringLiteral("%%1").arg(i) bit, I tested it in tst_qstring, the first % is left untouched. Test Plan: make && ctest Reviewers: mdawson, arichardson, vkrause Reviewed By: vkrause Subscribers: pino, arojas, mlaurent, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D23815 --- autotests/kconfigloadertest.cpp | 2 +- autotests/kconfigtest.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'autotests') diff --git a/autotests/kconfigloadertest.cpp b/autotests/kconfigloadertest.cpp index 1c818b7f..eae1e2b2 100644 --- a/autotests/kconfigloadertest.cpp +++ b/autotests/kconfigloadertest.cpp @@ -161,7 +161,7 @@ void ConfigLoaderTest::intListDefaultValue() expected.append(5); expected.append(8); - QVERIFY(typeItem->isEqual(qVariantFromValue(expected))); + QVERIFY(typeItem->isEqual(QVariant::fromValue(expected))); } void ConfigLoaderTest::longLongDefaultValue() diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp index 9af3b464..b915a07a 100644 --- a/autotests/kconfigtest.cpp +++ b/autotests/kconfigtest.cpp @@ -1341,7 +1341,7 @@ static void ageTimeStamp(const QString &path, int nsec) #ifdef Q_OS_UNIX QDateTime mtime = QFileInfo(path).lastModified().addSecs(-nsec); struct utimbuf utbuf; - utbuf.actime = mtime.toTime_t(); + utbuf.actime = mtime.toSecsSinceEpoch(); utbuf.modtime = utbuf.actime; utime(QFile::encodeName(path), &utbuf); #else -- cgit v1.2.1