diff options
| author | Niels Weber <niels.weber@digia.com> | 2014-11-14 11:03:29 +0100 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2014-11-14 12:42:12 +0100 |
| commit | b7f7c2784a3908a315e1e9d5025d027951ce549f (patch) | |
| tree | 7bac928adc293c555ab785463fc803cc2c21e8fd /tests/auto | |
| parent | a503c3aae5ceb0cf9d8108e7c8899824c2ba6d7b (diff) | |
Remove long-time deprecated icon setting
Change-Id: Ic17dd39a0c9228537d272ad46d3e126dffc1c4dc
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/installer/settings/data/full_config.xml | 1 | ||||
| -rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/installer/settings/data/full_config.xml b/tests/auto/installer/settings/data/full_config.xml index 3d7e86a6e..51b63315a 100644 --- a/tests/auto/installer/settings/data/full_config.xml +++ b/tests/auto/installer/settings/data/full_config.xml @@ -14,7 +14,6 @@ File should contain all elements we allow in a config.xml <TargetDir>@HomeDir@InstallationDirectory</TargetDir> <AdminTargetDir>@RootDir@InstallationDirectory</AdminTargetDir> - <Icon>icon</Icon> <InstallerApplicationIcon>icon</InstallerApplicationIcon> <InstallerWindowIcon>icon</InstallerWindowIcon> <Logo>logo</Logo> diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index b7ae9dfba..6567df11f 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -42,17 +42,14 @@ void tst_Settings::loadTutorialConfig() QCOMPARE(settings.banner(), QString()); QCOMPARE(settings.background(), QString()); #if defined(Q_OS_WIN) - QCOMPARE(settings.icon(), QLatin1String(":/installer.ico")); QCOMPARE(settings.installerApplicationIcon(), QLatin1String(":/installer.ico")); QCOMPARE(settings.installerWindowIcon(), QLatin1String(":/installer.ico")); QCOMPARE(settings.systemIconSuffix(), QLatin1String(".ico")); #elif defined(Q_OS_OSX) - QCOMPARE(settings.icon(), QLatin1String(":/installer.icns")); QCOMPARE(settings.installerApplicationIcon(), QLatin1String(":/installer.icns")); QCOMPARE(settings.installerWindowIcon(), QLatin1String(":/installer.icns")); QCOMPARE(settings.systemIconSuffix(), QLatin1String(".icns")); #else - QCOMPARE(settings.icon(), QLatin1String(":/installer.png")); QCOMPARE(settings.installerApplicationIcon(), QLatin1String(":/installer.png")); QCOMPARE(settings.installerWindowIcon(), QLatin1String(":/installer.png")); QCOMPARE(settings.systemIconSuffix(), QLatin1String(".png")); @@ -87,7 +84,6 @@ void tst_Settings::loadTutorialConfig() void tst_Settings::loadFullConfig() { - QTest::ignoreMessage(QtWarningMsg, "Deprecated element 'Icon'. "); Settings settings = Settings::fromFileAndPrefix(":///data/full_config.xml", ":///data"); } |