From f65954d9033cbd1d342ecb6c202920a0df992dc7 Mon Sep 17 00:00:00 2001
From: Niels Weber <niels.weber@digia.com>
Date: Thu, 21 Mar 2013 10:32:40 +0100
Subject: Remove previously deprecated Pages config.xml element.

Change-Id: I909c81896186ef5191d1dac799296da26e37072f
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 tests/auto/installer/settings/data/full_config.xml | 122 ---------------------
 tests/auto/installer/settings/tst_settings.cpp     |   1 -
 2 files changed, 123 deletions(-)

(limited to 'tests/auto/installer')

diff --git a/tests/auto/installer/settings/data/full_config.xml b/tests/auto/installer/settings/data/full_config.xml
index 899cb4b7c..36309f609 100644
--- a/tests/auto/installer/settings/data/full_config.xml
+++ b/tests/auto/installer/settings/data/full_config.xml
@@ -45,126 +45,4 @@ File should contain all elements we allow in a config.xml
             <Password>password</Password>
         </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>
 </Installer>
diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp
index 0accbc4e8..5d4cbd9b3 100644
--- a/tests/auto/installer/settings/tst_settings.cpp
+++ b/tests/auto/installer/settings/tst_settings.cpp
@@ -78,7 +78,6 @@ void tst_Settings::loadTutorialConfig()
 
 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");
-- 
cgit v1.2.3