diff --git a/autotests/kconfigloadertest.cpp b/autotests/kconfigloadertest.cpp --- a/autotests/kconfigloadertest.cpp +++ b/autotests/kconfigloadertest.cpp @@ -161,7 +161,7 @@ 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 --- a/autotests/kconfigtest.cpp +++ b/autotests/kconfigtest.cpp @@ -1341,7 +1341,7 @@ #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 diff --git a/src/core/kcoreconfigskeleton.cpp b/src/core/kcoreconfigskeleton.cpp --- a/src/core/kcoreconfigskeleton.cpp +++ b/src/core/kcoreconfigskeleton.cpp @@ -255,7 +255,7 @@ QVariant KCoreConfigSkeleton::ItemUrl::property() const { - return qVariantFromValue(mReference); + return QVariant::fromValue(mReference); } KCoreConfigSkeleton::ItemProperty::ItemProperty(const QString &_group, @@ -955,7 +955,7 @@ QVariant KCoreConfigSkeleton::ItemUrlList::property() const { - return qVariantFromValue >(mReference); + return QVariant::fromValue >(mReference); } KCoreConfigSkeleton::ItemIntList::ItemIntList(const QString &_group, const QString &_key, @@ -990,7 +990,7 @@ QVariant KCoreConfigSkeleton::ItemIntList::property() const { - return qVariantFromValue< QList >(mReference); + return QVariant::fromValue< QList >(mReference); } //static int kCoreConfigSkeletionDebugArea() { static int s_area = KDebug::registerArea("kdecore (KConfigSkeleton)"); return s_area; } diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp --- a/src/kconf_update/kconf_update.cpp +++ b/src/kconf_update/kconf_update.cpp @@ -200,10 +200,11 @@ QFileInfo info(file); KConfigGroup cg(m_config, fileName); - const QDateTime ctime = QDateTime::fromTime_t(cg.readEntry("ctime", 0u)); - const QDateTime mtime = QDateTime::fromTime_t(cg.readEntry("mtime", 0u)); + const QDateTime ctime = QDateTime::fromSecsSinceEpoch(cg.readEntry("ctime", 0u)); + const QDateTime mtime = QDateTime::fromSecsSinceEpoch(cg.readEntry("mtime", 0u)); if (!dirtyOnly || - (ctime != info.created()) || (mtime != info.lastModified())) { + (ctime.isValid() && ctime != info.birthTime()) || + mtime != info.lastModified()) { result.append(file); } } @@ -372,8 +373,10 @@ QFileInfo info(filename); KConfigGroup cg(m_config, m_currentFilename); - cg.writeEntry("ctime", info.created().toTime_t()); - cg.writeEntry("mtime", info.lastModified().toTime_t()); + if (info.birthTime().isValid()) { + cg.writeEntry("ctime", info.birthTime().toSecsSinceEpoch()); + } + cg.writeEntry("mtime", info.lastModified().toSecsSinceEpoch()); cg.sync(); return true; } diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp --- a/src/kconfig_compiler/kconfig_compiler.cpp +++ b/src/kconfig_compiler/kconfig_compiler.cpp @@ -1282,8 +1282,7 @@ for (QList::ConstIterator it = parameters.constBegin(); it != parameters.constEnd(); ++it) { if (paramString.contains("$(" + (*it).name + ')')) { - QString tmp; - tmp.sprintf("%%%d", i++); + const QString tmp = QStringLiteral("%%1").arg(i++); paramString.replace("$(" + (*it).name + ')', tmp); arguments += ".arg( mParam" + (*it).name + " )"; }