diff options
author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-11-16 17:23:30 +0200 |
---|---|---|
committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-12-21 10:16:32 +0200 |
commit | 347d9cd8525a0baadbd4822465248905877babd3 (patch) | |
tree | a9a7aa98f32008cfdc11132842fe63eb7113be05 /src/libs/kdtools | |
parent | 7ba80f53f3f493e6b66c9867a9f31cbdcf364466 (diff) |
Fix deprecation warnings from building with Qt 5.15.2
Also update build version requirements.
Task-number: QTIFW-2388
Change-Id: Iae1949548dda7a3b8d448228e27060efb5abd8eb
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/kdtools')
-rw-r--r-- | src/libs/kdtools/kdsysinfo_win.cpp | 2 | ||||
-rw-r--r-- | src/libs/kdtools/localpackagehub.cpp | 4 | ||||
-rw-r--r-- | src/libs/kdtools/sysinfo.cpp | 2 | ||||
-rw-r--r-- | src/libs/kdtools/sysinfo_x11.cpp | 4 | ||||
-rw-r--r-- | src/libs/kdtools/updatefinder.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/kdtools/kdsysinfo_win.cpp b/src/libs/kdtools/kdsysinfo_win.cpp index 0aa7e7aa3..465029252 100644 --- a/src/libs/kdtools/kdsysinfo_win.cpp +++ b/src/libs/kdtools/kdsysinfo_win.cpp @@ -68,7 +68,7 @@ QList<ProcessInfo> runningProcesses() char buffer[bufferSize + 1] = { 0 }; if (QSysInfo::windowsVersion() <= QSysInfo::WV_5_2) { const DWORD size = GetLogicalDriveStringsA(bufferSize, buffer); - deviceList = QString::fromLatin1(buffer, size).split(QLatin1Char(char(0)), QString::SkipEmptyParts); + deviceList = QString::fromLatin1(buffer, size).split(QLatin1Char(char(0)), Qt::SkipEmptyParts); } QLibrary kernel32(QLatin1String("Kernel32.dll")); diff --git a/src/libs/kdtools/localpackagehub.cpp b/src/libs/kdtools/localpackagehub.cpp index 2ee880e04..a1c112900 100644 --- a/src/libs/kdtools/localpackagehub.cpp +++ b/src/libs/kdtools/localpackagehub.cpp @@ -488,10 +488,10 @@ void LocalPackageHub::PackagesInfoData::addPackageFrom(const QDomElement &packag info.uncompressedSize = childNodeE.text().toULongLong(); else if (childNodeE.tagName() == QLatin1String("Dependencies")) { info.dependencies = childNodeE.text().split(QInstaller::commaRegExp(), - QString::SkipEmptyParts); + Qt::SkipEmptyParts); } else if (childNodeE.tagName() == QLatin1String("AutoDependOn")) { info.autoDependencies = childNodeE.text().split(QInstaller::commaRegExp(), - QString::SkipEmptyParts); + Qt::SkipEmptyParts); } else if (childNodeE.tagName() == QLatin1String("ForcedInstallation")) info.forcedInstallation = childNodeE.text().toLower() == QLatin1String( "true" ) ? true : false; else if (childNodeE.tagName() == QLatin1String("LastUpdateDate")) diff --git a/src/libs/kdtools/sysinfo.cpp b/src/libs/kdtools/sysinfo.cpp index df9a374f2..9512e59e3 100644 --- a/src/libs/kdtools/sysinfo.cpp +++ b/src/libs/kdtools/sysinfo.cpp @@ -71,7 +71,7 @@ VolumeInfo VolumeInfo::fromPath(const QString &path) } // the target directory does not exist yet, we need to cd up till we find the first existing dir - QStringList parts = targetPath.absolutePath().split(QDir::separator(),QString::SkipEmptyParts); + QStringList parts = targetPath.absolutePath().split(QDir::separator(), Qt::SkipEmptyParts); while (targetPath.absolutePath() != QDir::rootPath()) { if (targetPath.exists()) break; diff --git a/src/libs/kdtools/sysinfo_x11.cpp b/src/libs/kdtools/sysinfo_x11.cpp index bc55939a6..a59fd150b 100644 --- a/src/libs/kdtools/sysinfo_x11.cpp +++ b/src/libs/kdtools/sysinfo_x11.cpp @@ -60,7 +60,7 @@ quint64 installedMemory() else if (s.isEmpty()) return quint64(); - const QStringList parts = s.split(QLatin1Char(' '), QString::SkipEmptyParts); + const QStringList parts = s.split(QLatin1Char(' '), Qt::SkipEmptyParts); return quint64(parts.at(1).toInt() * 1024LL); } #else @@ -99,7 +99,7 @@ QList<VolumeInfo> mountedVolumes() if (!s.startsWith(QLatin1Char('/')) && !s.startsWith(QLatin1String("tmpfs ") + QDir::tempPath())) continue; - const QStringList parts = s.split(QLatin1Char(' '), QString::SkipEmptyParts); + const QStringList parts = s.split(QLatin1Char(' '), Qt::SkipEmptyParts); VolumeInfo v; v.setMountPath(parts.at(1)); diff --git a/src/libs/kdtools/updatefinder.cpp b/src/libs/kdtools/updatefinder.cpp index 5bf33d4a4..ed45b9797 100644 --- a/src/libs/kdtools/updatefinder.cpp +++ b/src/libs/kdtools/updatefinder.cpp @@ -375,7 +375,7 @@ QList<UpdateInfo> UpdateFinder::Private::applicableUpdates(UpdatesInfo *updatesI // Catch hold of app names contained updatesInfo->applicationName() // If the application appName isn't one of the app names, then the updates are not applicable. - const QStringList apps = appName.split(QInstaller::commaRegExp(), QString::SkipEmptyParts); + const QStringList apps = appName.split(QInstaller::commaRegExp(), Qt::SkipEmptyParts); if (apps.indexOf([&packages] { return packages->isValid() ? packages->applicationName() : QCoreApplication::applicationName(); } ()) < 0) { return dummy; |