From 6ad988cb3df6ca3eac302444182b68fef383770f Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Wed, 18 May 2016 13:50:11 +0200 Subject: [PATCH] force icon themes explicitly via new testing helper function REVIEW: 127954 --- autotests/iconitemtest.cpp | 8 +------- autotests/themetest.cpp | 8 ++------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/autotests/iconitemtest.cpp b/autotests/iconitemtest.cpp index bc97aaea5..e6bbc669c 100644 --- a/autotests/iconitemtest.cpp +++ b/autotests/iconitemtest.cpp @@ -73,13 +73,7 @@ void IconItemTest::initTestCase() 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"); - plasmaConfig.writeEntry("name", "default"); - - cg.sync(); // sync explicitly so it will be correctly parsed - KSharedConfig::openConfig()->reparseConfiguration(); + KIconTheme::forceThemeForTests("test-theme"); KIconTheme::reconfigure(); KIconLoader::global()->reconfigure(QString()); diff --git a/autotests/themetest.cpp b/autotests/themetest.cpp index 70fd56acf..6b6bc7113 100644 --- a/autotests/themetest.cpp +++ b/autotests/themetest.cpp @@ -47,13 +47,11 @@ void ThemeTest::initTestCase() QIcon::setThemeSearchPaths(QStringList()<reparseConfiguration(); KIconTheme::reconfigure(); KIconLoader::global()->reconfigure(QString()); @@ -89,9 +87,7 @@ void ThemeTest::loadSvgIcon() QSignalSpy spy(m_svg, SIGNAL(repaintNeeded())); QVERIFY(spy.isValid()); - KConfigGroup cg(KSharedConfig::openConfig("kdeglobals"), "Icons"); - cg.writeEntry("Theme", "test-theme-two"); - cg.sync(); + KIconTheme::forceThemeForTests("test-theme-two"); // KIconloader needs changesto be emitted manually, ouch. for (int i=0; i < KIconLoader::LastGroup; i++) { KIconLoader::emitChange(KIconLoader::Group(i));