From ab302872d300158a590af841bb890392d11489be Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 6 Mar 2016 16:13:54 +0100 Subject: [PATCH] Fix iconitem test - second try --- autotests/data/icons/test-theme/index.theme | 4 +--- autotests/iconitemtest.cpp | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/autotests/data/icons/test-theme/index.theme b/autotests/data/icons/test-theme/index.theme index 52a72759d..5eaeff31d 100644 --- a/autotests/data/icons/test-theme/index.theme +++ b/autotests/data/icons/test-theme/index.theme @@ -3,8 +3,6 @@ Name=Unittest Theme DisplayDepth=32 -Inherits=breeze - DesktopDefault=48 DesktopSizes=16,22,32,48,64,128,256 ToolbarDefault=22 @@ -21,7 +19,7 @@ DialogSizes=16,22,32,48,64,128,256 ########## Directories ########## ordered by category and alphabetically -Directories=apps/22,apps/32 +Directories=apps/22,apps/32,apps/48 [apps/22] Size=22 diff --git a/autotests/iconitemtest.cpp b/autotests/iconitemtest.cpp index 5853f7445..ae825a970 100644 --- a/autotests/iconitemtest.cpp +++ b/autotests/iconitemtest.cpp @@ -61,6 +61,9 @@ void IconItemTest::initTestCase() QFile::remove(configPath); + QIcon::setThemeSearchPaths({QFINDTESTDATA("data/icons")}); + QIcon::setThemeName("test-theme"); + KConfigGroup cg(KSharedConfig::openConfig(), "Icons"); cg.writeEntry("Theme", "test-theme"); KConfigGroup plasmaConfig(KSharedConfig::openConfig("plasmarc"), "Theme");