diff options
author | Katja Marttila <katja.marttila@qt.io> | 2019-12-02 13:31:27 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2019-12-17 06:43:31 +0000 |
commit | eca45594967aba89c124a8b88ee8917b35d76181 (patch) | |
tree | 4396223e2ae389c986188cf4942ee07a606fb877 /tools | |
parent | 4744ad130a2d4310e812a89da22d36a2e885b281 (diff) |
Documentation fixes
Change-Id: Ibffb5470d374c8d612791f48c951deddd00f3121
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/archivegen/archive.cpp | 2 | ||||
-rw-r--r-- | tools/common/repositorygen.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/archivegen/archive.cpp b/tools/archivegen/archive.cpp index eac794585..d31e8fdc3 100644 --- a/tools/archivegen/archive.cpp +++ b/tools/archivegen/archive.cpp @@ -184,7 +184,7 @@ int main(int argc, char *argv[]) } Lib7z::initSevenZ(); - Lib7z::createArchive(args[0], args.mid(1), Lib7z::QTmpFile::No, Lib7z::Compression(value), + Lib7z::createArchive(args[0], args.mid(1), Lib7z::TmpFile::No, Lib7z::Compression(value), [&] () -> Lib7z::UpdateCallback * { if (parser.isSet(verbose)) return new VerbosePrinterCallback; diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index a1144a005..7034d32fb 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -682,7 +682,7 @@ void QInstallerTools::compressMetaDirectories(const QString &repoDir, const QStr const QString absPath = sd.absolutePath(); const QString fn = QLatin1String(versionPrefix.toLatin1() + "meta.7z"); const QString tmpTarget = repoDir + QLatin1String("/") +fn; - Lib7z::createArchive(tmpTarget, QStringList() << absPath, Lib7z::QTmpFile::No); + Lib7z::createArchive(tmpTarget, QStringList() << absPath, Lib7z::TmpFile::No); // remove the files that got compressed QInstaller::removeFiles(absPath, true); @@ -742,7 +742,7 @@ void QInstallerTools::copyComponentData(const QStringList &packageDirs, const QS qDebug() << "Compressing data directory" << entry; QString target = QString::fromLatin1("%1/%3%2.7z").arg(namedRepoDir, entry, info.version); Lib7z::createArchive(target, QStringList() << dataDir.absoluteFilePath(entry), - Lib7z::QTmpFile::No); + Lib7z::TmpFile::No); compressedFiles.append(target); } else if (fileInfo.isSymLink()) { filesToCompress.append(dataDir.absoluteFilePath(entry)); @@ -754,7 +754,7 @@ void QInstallerTools::copyComponentData(const QStringList &packageDirs, const QS qDebug() << "Compressing files found in data directory:" << filesToCompress; QString target = QString::fromLatin1("%1/%3%2").arg(namedRepoDir, QLatin1String("content.7z"), info.version); - Lib7z::createArchive(target, filesToCompress, Lib7z::QTmpFile::No); + Lib7z::createArchive(target, filesToCompress, Lib7z::TmpFile::No); compressedFiles.append(target); } |