diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-18 16:06:12 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-18 16:06:48 +0100 |
| commit | b622922240c00a6e7c2b4e4e5ad995c2fe675d88 (patch) | |
| tree | eab55cf013bc27ff13c89844cba89c2ee1674c16 /tests/auto/installer | |
| parent | 99c26d57ab877da638acf1cd292490ef412ec171 (diff) | |
| parent | 356b68c4fc5f81d74dc5ecc8e8ac76d5e055cc38 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Change-Id: I36a907cf2ee075eace35dcc42317f4202c1f5569
Diffstat (limited to 'tests/auto/installer')
| -rw-r--r-- | tests/auto/installer/settings/data/full_config.xml | 1 | ||||
| -rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/installer/settings/data/full_config.xml b/tests/auto/installer/settings/data/full_config.xml index d52514642..b66764a6e 100644 --- a/tests/auto/installer/settings/data/full_config.xml +++ b/tests/auto/installer/settings/data/full_config.xml @@ -16,7 +16,6 @@ File should contain all elements we allow in a config.xml <Icon>icon</Icon> <Logo>logo</Logo> - <LogoSmall>logo_small</LogoSmall> <Watermark>watermark</Watermark> <Background>background</Background> diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index a578ea37e..a4239c1dc 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -35,7 +35,6 @@ void tst_Settings::loadTutorialConfig() // default values QCOMPARE(settings.logo(), QLatin1String(":///data/")); - QCOMPARE(settings.logoSmall(), QLatin1String(":///data/")); QCOMPARE(settings.url(), QString()); QCOMPARE(settings.watermark(), QLatin1String(":///data/")); QCOMPARE(settings.background(), QLatin1String(":///data/")); |