2 files changed, 19 insertions, 122 deletions
diff --git a/tests/auto/installer/settings/data/full_config.xml b/tests/auto/installer/settings/data/full_config.xml
index cde9f6310..0386f98c1 100644
--- a/tests/auto/installer/settings/data/full_config.xml
+++ b/tests/auto/installer/settings/data/full_config.xml
@@ -15,8 +15,11 @@ File should contain all elements we allow in a config.xml
     <AdminTargetDir>@rootDir@InstallationDirectory</AdminTargetDir>
 
     <Icon>icon</Icon>
+    <InstallerApplicationIcon>icon</InstallerApplicationIcon>
+    <InstallerWindowIcon>icon</InstallerWindowIcon>
     <Logo>logo</Logo>
     <Watermark>watermark</Watermark>
+    <Banner>banner</Banner>
     <Background>background</Background>
 
     <StartMenuDir>Super App</StartMenuDir>
@@ -26,6 +29,7 @@ File should contain all elements we allow in a config.xml
     <RemoveTargetDir>true</RemoveTargetDir>
 
     <RunProgram>myapp</RunProgram>
+    <RunProgramArguments>foo bar</RunProgramArguments>
     <RunProgramDescription>Launch MyApp</RunProgramDescription>
 
     <DependsOnLocalInstallerBinary>true</DependsOnLocalInstallerBinary>
@@ -43,125 +47,8 @@ File should contain all elements we allow in a config.xml
         </Repository>
     </RemoteRepositories>
 
-    <Pages>
-       <Page name="IntroductionPage">
-           <Title>
-               <Default>Introduction Page Title</Default>
-           </Title>
-           <SubTitle>
-               <Default>Introduction Page Sub Title</Default>
-           </SubTitle>
-           <MessageLabel>Introduction Page Message Label</MessageLabel>
-       </Page>
-       <Page name="LicenseAgreementPage">
-           <Title>
-               <Default>License Agreement Page Title</Default>
-           </Title>
-           <SubTitle>
-               <Default>License Agreement Page Sub Title</Default>
-           </SubTitle>
-           <AcceptLicenseLabel>Accept License Radio Button</AcceptLicenseLabel>
-           <RejectLicenseLabel>Reject License Radio Button</RejectLicenseLabel>
-       </Page>
-       <Page name="ComponentSelectionPage">
-           <Title>
-               <Default>Component Selection Page Title</Default>
-               <Updater>Component Selection Page Sub Title Updater</Updater>
-               <Installer>Component Selection Page Sub Title Installer</Installer>
-               <Uninstaller>Component Selection Page Sub Title Uninstaller</Uninstaller>
-               <PackageManager>Component Selection Page Sub Title Package Manager</PackageManager>
-           </Title>
-           <SubTitle>
-               <Default>Component Selection Page Sub Title</Default>
-               <Updater>Component Selection Page Sub Title Updater</Updater>
-               <Installer>Component Selection Page Sub Title Installer</Installer>
-               <Uninstaller>Component Selection Page Sub Title Uninstaller</Uninstaller>
-               <PackageManager>Component Selection Page Sub Title Package Manager</PackageManager>
-           </SubTitle>
-           <SelectDefaultComponentsButton>Default Button</SelectDefaultComponentsButton>
-           <SelectAllComponentsButton>Select All Button</SelectAllComponentsButton>
-           <DeselectAllComponentsButton>Deselect All Button</DeselectAllComponentsButton>
-           <ComponentSizeLabel>Component Size Label</ComponentSizeLabel>
-       </Page>
-       <Page name="TargetDirectoryPage">
-           <Title>
-               <Default>Target Directory Page Title</Default>
-           </Title>
-           <SubTitle>
-               <Default>Target Directory Page Sub Title</Default>
-           </SubTitle>
-           <MessageLabel>Target Directory Page Message Label</MessageLabel>
-           <BrowseDirectoryButton>Browse Directory Button</BrowseDirectoryButton>
-           <EmptyTargetDirectoryMessage>Empty Target Directory Message</EmptyTargetDirectoryMessage>
-           <ForbiddenTargetDirectoryMessage>Forbidden Target Directory Message</ForbiddenTargetDirectoryMessage>
-           <OverwriteTargetDirectoryMessage>Overwrite Target Directory Message</OverwriteTargetDirectoryMessage>
-           <SelectInstallationFolderCaption>Select Installation Folder Caption</SelectInstallationFolderCaption>
-       </Page>
-       <Page name="StartMenuDirectoryPage">
-           <Title>
-               <Default>Start Menu Directory Page Title</Default>
-           </Title>
-           <SubTitle>
-               <Default>Start Menu Directory Page Sub Title</Default>
-           </SubTitle>
-       </Page>
-       <Page name="ReadyForInstallationPage">
-           <Title>
-               <Default>Ready for Installation Page Title</Default>
-               <Updater>Ready for Installation Page Title Updater</Updater>
-               <Installer>Ready for Installation Page Title Installer</Installer>
-               <Uninstaller>Ready for Installation Page Title Uninstaller</Uninstaller>
-               <PackageManager>Ready for Installation Page Title Package Manager</PackageManager>
-           </Title>
-           <SubTitle>
-               <Default>Ready for Installation Page Sub Title</Default>
-               <Updater>Ready for Installation Page Sub Title Updater</Updater>
-               <Installer>Ready for Installation Page Sub Title Installer</Installer>
-               <Uninstaller>Ready for Installation Page Sub Title Uninstaller</Uninstaller>
-               <PackageManager>Ready for Installation Page Sub Title Package Manager</PackageManager>
-           </SubTitle>
-           <MessageLabel>Ready for Installation Page Message Label</MessageLabel>
-       </Page>
-       <Page name="PerformInstallationPage">
-           <Title>
-               <Default>Perform Installation Page Title</Default>
-               <Updater>Perform Installation Page Title Updater</Updater>
-               <Installer>Perform Installation Page Title Installer</Installer>
-               <Uninstaller>Perform Installation Page Title Uninstaller</Uninstaller>
-               <PackageManager>Perform Installation Page Title Package Manager</PackageManager>
-           </Title>
-           <SubTitle>
-               <Default>Perform Installation Page Sub Title</Default>
-               <Updater>Perform Installation Page Sub Title Updater</Updater>
-               <Installer>Perform Installation Page Sub Title Installer</Installer>
-               <Uninstaller>Perform Installation Page Sub Title Uninstaller</Uninstaller>
-               <PackageManager>Perform Installation Page Sub Title Package Manager</PackageManager>
-           </SubTitle>
-       </Page>
-       <Page name ="FinishedPage">
-           <Title>
-               <Default>Finished Page Title</Default>
-               <Updater>Finished Page Title Updater</Updater>
-               <Installer>Finished Page Title Installer</Installer>
-               <Uninstaller>Finished Page Title Uninstaller</Uninstaller>
-               <PackageManager>Finished Page Title Package Manager</PackageManager>
-           </Title>
-           <SubTitle>
-               <Default>Finished Page Sub Title</Default>
-               <Updater>Finished Page Sub Title Updater</Updater>
-               <Installer>Finished Page Sub Title Installer</Installer>
-               <Uninstaller>Finished Page Sub Title Uninstaller</Uninstaller>
-               <PackageManager>Finished Page Sub Title Package Manager</PackageManager>
-           </SubTitle>
-           <MessageLabel>Finished Page Message Label</MessageLabel>
-       </Page>
-       <Page name="RestartPage">
-           <Title>
-               <Default>Restart Page Title</Default>
-           </Title>
-           <SubTitle>
-               <Default>Restart Page Sub Title</Default>
-           </SubTitle>
-       </Page>
-   </Pages>
+    <Translations>
+        <Translation>de_de</Translation>
+        <Translation>qt_de</Translation>
+    </Translations>
 </Installer>
diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp
index be42a24ae..e6ebc6e6e 100644
--- a/tests/auto/installer/settings/tst_settings.cpp
+++ b/tests/auto/installer/settings/tst_settings.cpp
@@ -38,15 +38,23 @@ void tst_Settings::loadTutorialConfig()
     QCOMPARE(settings.logo(), QLatin1String(":///data/"));
     QCOMPARE(settings.url(), QString());
     QCOMPARE(settings.watermark(), QLatin1String(":///data/"));
+    QCOMPARE(settings.banner(), QLatin1String(":///data/"));
     QCOMPARE(settings.background(), QLatin1String(":///data/"));
 #if defined(Q_OS_WIN)
     QCOMPARE(settings.icon(), QLatin1String(":/installer.ico"));
+    QCOMPARE(settings.installerApplicationIcon(), QLatin1String(":/installer.ico"));
+    QCOMPARE(settings.installerWindowIcon(), QLatin1String(":/installer.ico"));
 #elif defined(Q_OS_MAC)
     QCOMPARE(settings.icon(), QLatin1String(":/installer.icns"));
+    QCOMPARE(settings.installerApplicationIcon(), QLatin1String(":/installer.icns"));
+    QCOMPARE(settings.installerWindowIcon(), QLatin1String(":/installer.icns"));
 #else
     QCOMPARE(settings.icon(), QLatin1String(":/installer.png"));
+    QCOMPARE(settings.installerApplicationIcon(), QLatin1String(":/installer.png"));
+    QCOMPARE(settings.installerWindowIcon(), QLatin1String(":/installer.png"));
 #endif
     QCOMPARE(settings.runProgram(), QString());
+    QCOMPARE(settings.runProgramArguments(), QString());
     QCOMPARE(settings.runProgramDescription(), QString());
     QCOMPARE(settings.adminTargetDir(), QString());
     QCOMPARE(settings.removeTargetDir(), QLatin1String("true"));
@@ -68,11 +76,13 @@ void tst_Settings::loadTutorialConfig()
     QCOMPARE(settings.proxyType(), Settings::NoProxy);
     QCOMPARE(settings.ftpProxy(), QNetworkProxy());
     QCOMPARE(settings.httpProxy(), QNetworkProxy());
+
+    QCOMPARE(settings.translations(), QStringList());
 }
 
 void tst_Settings::loadFullConfig()
 {
-    QTest::ignoreMessage(QtWarningMsg, "Deprecated element 'Pages'. ");
+    QTest::ignoreMessage(QtWarningMsg, "Deprecated element 'Icon'. ");
     Settings settings = Settings::fromFileAndPrefix(":///data/full_config.xml", ":///data");
 }