diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-11-24 06:20:07 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-11-24 06:20:07 +0200 |
| commit | 79011733f7a00da988d482dde443418c9df38784 (patch) | |
| tree | aae5e8dbdd254cb2538e66e4649b1c86d39191ae /tests/auto/tools/repotest/settings.qrc | |
| parent | d863c8abcf29e971e0adb8dcb2fc12971a4e98f1 (diff) | |
| parent | 13c9e1111d89d1a2a06954c00bb3d3c33d4ecfa3 (diff) | |
Merge remote-tracking branch 'origin/4.0' into master
Change-Id: If5205ff6ef2c8989520e24d41595c04d5920d207
Diffstat (limited to 'tests/auto/tools/repotest/settings.qrc')
| -rw-r--r-- | tests/auto/tools/repotest/settings.qrc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/tools/repotest/settings.qrc b/tests/auto/tools/repotest/settings.qrc index 77d250b20..e731af222 100644 --- a/tests/auto/tools/repotest/settings.qrc +++ b/tests/auto/tools/repotest/settings.qrc @@ -20,16 +20,16 @@ <file>repository_componentAndUnite/A/2.0.0content.7z</file> <file>repository_componentAndUnite/A/2.0.0content.7z.sha1</file> <file>repository_componentAndUnite/A/2.0.0meta.7z</file> - <file>repository_componentAndUnite/B/1.0.0content.7z</file> - <file>repository_componentAndUnite/B/1.0.0content.7z.sha1</file> - <file>repository_componentAndUnite/B/1.0.0meta.7z</file> - <file>repository_componentAndUnite/2020-10-13-0958_meta.7z</file> + <file>repository_componentAndUnite/C/1.0.0content.7z</file> + <file>repository_componentAndUnite/C/1.0.0content.7z.sha1</file> + <file>repository_componentAndUnite/C/1.0.0meta.7z</file> + <file>repository_componentAndUnite/2020-11-10-0816_meta.7z</file> <file>repository_componentAndUnite/Updates.xml</file> <file>repository_unite/A/2.0.0content.7z</file> <file>repository_unite/A/2.0.0content.7z.sha1</file> - <file>repository_unite/B/1.0.0content.7z</file> - <file>repository_unite/B/1.0.0content.7z.sha1</file> - <file>repository_unite/2020-10-13-0958_meta.7z</file> + <file>repository_unite/C/1.0.0content.7z</file> + <file>repository_unite/C/1.0.0content.7z.sha1</file> + <file>repository_unite/2020-11-10-0931_meta.7z</file> <file>repository_unite/Updates.xml</file> </qresource> </RCC> |