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>

12 files changed, 6 insertions, 28 deletions

diff --git a/tests/auto/installer/cliinterface/cliinterface.pro b/tests/auto/installer/cliinterface/cliinterface.pro
index 5387a73a3..ccad1a00f 100644
--- a/tests/auto/installer/cliinterface/cliinterface.pro
+++ b/tests/auto/installer/cliinterface/cliinterface.pro
@@ -5,4 +5,5 @@ QT += qml
 SOURCES += tst_cliinterface.cpp
 
 RESOURCES += \
-    settings.qrc
+    settings.qrc \
+    ..\shared\config.qrc
diff --git a/tests/auto/installer/cliinterface/settings.qrc b/tests/auto/installer/cliinterface/settings.qrc
index a0a36d999..85e344d1b 100644
--- a/tests/auto/installer/cliinterface/settings.qrc
+++ b/tests/auto/installer/cliinterface/settings.qrc
@@ -21,7 +21,4 @@
         <file>data/installPackagesRepository/componentF.subcomponent2.subsubcomponent2/1.0.0content.7z</file>
         <file>data/componentsFromInstallPackagesRepository.xml</file>
     </qresource>
-    <qresource prefix="/metadata">
-        <file>installer-config/config.xml</file>
-    </qresource>
 </RCC>
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>
diff --git a/tests/auto/installer/linereplaceoperation/installer-config/config.xml b/tests/auto/installer/linereplaceoperation/installer-config/config.xml
deleted file mode 100644
index adc24631b..000000000
--- a/tests/auto/installer/linereplaceoperation/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/linereplaceoperation/linereplaceoperation.pro b/tests/auto/installer/linereplaceoperation/linereplaceoperation.pro
index 557ee7d3c..3aead8afb 100644
--- a/tests/auto/installer/linereplaceoperation/linereplaceoperation.pro
+++ b/tests/auto/installer/linereplaceoperation/linereplaceoperation.pro
@@ -6,4 +6,5 @@ QT += testlib
 SOURCES += tst_linereplaceoperation.cpp
 
 RESOURCES += \
-    settings.qrc
+    settings.qrc \
+    ..\shared\config.qrc
diff --git a/tests/auto/installer/linereplaceoperation/settings.qrc b/tests/auto/installer/linereplaceoperation/settings.qrc
index 620d72953..66969539d 100644
--- a/tests/auto/installer/linereplaceoperation/settings.qrc
+++ b/tests/auto/installer/linereplaceoperation/settings.qrc
@@ -5,7 +5,4 @@
         <file>data/repository/A/1.0.2-1content.7z.sha1</file>
         <file>data/repository/A/1.0.2-1meta.7z</file>
     </qresource>
-    <qresource prefix="/metadata">
-        <file>installer-config/config.xml</file>
-    </qresource>
 </RCC>
diff --git a/tests/auto/installer/packagemanagercore/installer-config/config.xml b/tests/auto/installer/packagemanagercore/installer-config/config.xml
deleted file mode 100644
index adc24631b..000000000
--- a/tests/auto/installer/packagemanagercore/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/packagemanagercore/packagemanagercore.pro b/tests/auto/installer/packagemanagercore/packagemanagercore.pro
index 6e9e387fa..3dfefbab6 100644
--- a/tests/auto/installer/packagemanagercore/packagemanagercore.pro
+++ b/tests/auto/installer/packagemanagercore/packagemanagercore.pro
@@ -5,4 +5,4 @@ QT += qml
 SOURCES += tst_packagemanagercore.cpp
 
 RESOURCES += \
-    settings.qrc
+    ..\shared\config.qrc
diff --git a/tests/auto/installer/packagemanagercore/settings.qrc b/tests/auto/installer/shared/config.qrc
index b25a589a3..b25a589a3 100644
--- a/tests/auto/installer/packagemanagercore/settings.qrc
+++ b/tests/auto/installer/shared/config.qrc
diff --git a/tests/auto/installer/cliinterface/installer-config/config.xml b/tests/auto/installer/shared/installer-config/config.xml
index adc24631b..adc24631b 100644
--- a/tests/auto/installer/cliinterface/installer-config/config.xml
+++ b/tests/auto/installer/shared/installer-config/config.xml