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/ifwtools | |
| 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/ifwtools')
| -rw-r--r-- | src/libs/ifwtools/repositorygen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/ifwtools/repositorygen.cpp b/src/libs/ifwtools/repositorygen.cpp index a045c5248..874d88494 100644 --- a/src/libs/ifwtools/repositorygen.cpp +++ b/src/libs/ifwtools/repositorygen.cpp @@ -525,7 +525,7 @@ PackageInfoVector QInstallerTools::createListOfPackages(const QStringList &packa .arg(QDir::toNativeSeparators(fileInfo.absoluteFilePath()), info.version)); } info.dependencies = packageElement.firstChildElement(QLatin1String("Dependencies")).text() - .split(QInstaller::commaRegExp(), QString::SkipEmptyParts); + .split(QInstaller::commaRegExp(), Qt::SkipEmptyParts); info.directory = it->filePath(); if (packagesUpdatedWithSha.contains(info.name)) { info.createContentSha1Node = true; @@ -663,10 +663,10 @@ PackageInfoVector QInstallerTools::createListOfRepositoryPackages(const QStringL const QDomElement c2Element = c2.at(j).toElement(); if (c2Element.tagName() == QInstaller::scDependencies) info.dependencies = c2Element.text() - .split(QInstaller::commaRegExp(), QString::SkipEmptyParts); + .split(QInstaller::commaRegExp(), Qt::SkipEmptyParts); else if (c2Element.tagName() == QInstaller::scDownloadableArchives) { QStringList names = c2Element.text() - .split(QInstaller::commaRegExp(), QString::SkipEmptyParts); + .split(QInstaller::commaRegExp(), Qt::SkipEmptyParts); foreach (const QString &name, names) { info.copiedFiles.append(QString::fromLatin1("%1/%3%2").arg(info.directory, name, info.version)); |