diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-07-29 14:09:48 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-07-30 09:49:33 +0200 |
commit | af045e1321caaedeb12b33398c5bdc3a548bd02d (patch) | |
tree | 808683bd07b7339f67144801c7e364c7ac51b8ab | |
parent | e778ad5ccf76a830390db3d658abd1aeb75fafd3 (diff) |
rename copiedArchives to copiedFiles
- they are including the sha1 files so the old name was misleading
Change-Id: I6156b5590bc98ed319a093c82be32d9f79699d28
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
-rw-r--r-- | tools/binarycreator/binarycreator.cpp | 2 | ||||
-rw-r--r-- | tools/common/repositorygen.cpp | 4 | ||||
-rw-r--r-- | tools/common/repositorygen.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index d7bb0d93a..0209f09a0 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -737,7 +737,7 @@ int main(int argc, char **argv) comp.setName(info.name.toUtf8()); qDebug() << "Creating component info for" << info.name; - foreach (const QString &archive, info.copiedArchives) { + foreach (const QString &archive, info.copiedFiles) { const QSharedPointer<Archive> arch(new Archive(archive)); qDebug() << QString::fromLatin1("Appending %1 (%2)").arg(archive, humanReadableSize(arch->size())); diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index 9b95203d2..20add6d81 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -580,7 +580,7 @@ void QInstallerTools::copyComponentData(const QString &packageDir, const QString } foreach (const QString &target, compressedFiles) { - (*infos)[i].copiedArchives.append(target); + (*infos)[i].copiedFiles.append(target); QFile archiveFile(target); QFile archiveHashFile(archiveFile.fileName() + QLatin1String(".sha1")); @@ -597,7 +597,7 @@ void QInstallerTools::copyComponentData(const QString &packageDir, const QString QInstaller::openForWrite(&archiveHashFile, archiveHashFile.fileName()); archiveHashFile.write(hashOfArchiveData); qDebug() << "Generated sha1 hash:" << hashOfArchiveData; - (*infos)[i].copiedArchives.append(archiveHashFile.fileName()); + (*infos)[i].copiedFiles.append(archiveHashFile.fileName()); archiveHashFile.close(); } catch (const QInstaller::Error &/*e*/) { archiveFile.close(); diff --git a/tools/common/repositorygen.h b/tools/common/repositorygen.h index bd941a206..b415bd561 100644 --- a/tools/common/repositorygen.h +++ b/tools/common/repositorygen.h @@ -55,7 +55,7 @@ struct PackageInfo QString version; QString directory; QStringList dependencies; - QStringList copiedArchives; + QStringList copiedFiles; }; typedef QVector<PackageInfo> PackageInfoVector; |