summaryrefslogtreecommitdiffstats
path: root/tests/auto/installer/commandlineupdate
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2020-03-31 11:41:11 +0300
committerKatja Marttila <katja.marttila@qt.io>2020-04-02 07:32:18 +0300
commit4ace54659912e0546c451adb932a3ca870ad6c31 (patch)
tree40b9b3d6ffec8f084627a81bc02cca349194c6a7 /tests/auto/installer/commandlineupdate
parent295ba75e810cd4a1891c37c7f46d8b39e121e335 (diff)
Tests: Move commonly used config to shared folder
Change-Id: I7fb184cec2f0d62097a05966779002541145e823 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'tests/auto/installer/commandlineupdate')
-rw-r--r--tests/auto/installer/commandlineupdate/commandlineupdate.pro2
-rw-r--r--tests/auto/installer/commandlineupdate/installer-config/config.xml5
-rw-r--r--tests/auto/installer/commandlineupdate/settings.qrc3
3 files changed, 1 insertions, 9 deletions
diff --git a/tests/auto/installer/commandlineupdate/commandlineupdate.pro b/tests/auto/installer/commandlineupdate/commandlineupdate.pro
index 3446eb286..019b7abd6 100644
--- a/tests/auto/installer/commandlineupdate/commandlineupdate.pro
+++ b/tests/auto/installer/commandlineupdate/commandlineupdate.pro
@@ -5,4 +5,4 @@ QT += qml
SOURCES += tst_commandlineupdate.cpp
RESOURCES += \
- settings.qrc
+ ..\shared\config.qrc
diff --git a/tests/auto/installer/commandlineupdate/installer-config/config.xml b/tests/auto/installer/commandlineupdate/installer-config/config.xml
deleted file mode 100644
index adc24631b..000000000
--- a/tests/auto/installer/commandlineupdate/installer-config/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Installer>
- <Name>test</Name>
- <Version>1.0.0</Version>
-</Installer>
diff --git a/tests/auto/installer/commandlineupdate/settings.qrc b/tests/auto/installer/commandlineupdate/settings.qrc
index b410099f4..812727cd2 100644
--- a/tests/auto/installer/commandlineupdate/settings.qrc
+++ b/tests/auto/installer/commandlineupdate/settings.qrc
@@ -32,7 +32,4 @@
<file>data/installPackagesRepositoryUpdate/componentF.subcomponent2.subsubcomponent1/1.0.0content.7z</file>
<file>data/installPackagesRepositoryUpdate/componentF.subcomponent2.subsubcomponent2/1.0.0content.7z</file>
</qresource>
- <qresource prefix="/metadata">
- <file>installer-config/config.xml</file>
- </qresource>
</RCC>