kdeui: adjust kglobalsettings and kiconloader tests

This commit is contained in:
Ivailo Monev 2015-10-01 05:43:49 +03:00
parent 8cb6298f30
commit fc7e1941e9
2 changed files with 2 additions and 10 deletions

View file

@ -63,12 +63,8 @@ void KGlobalSettingsTest::initTestCase()
static void callClient( const QString& opt, const char* signalToWaitFor ) {
KProcess proc;
if (QFile::exists("./kglobalsettingsclient.shell"))
proc << "./kglobalsettingsclient.shell";
else {
QVERIFY(QFile::exists("./kglobalsettingsclient"));
proc << "./kglobalsettingsclient";
}
QVERIFY(QFile::exists("./kdeui-kglobalsettingsclient"));
proc << "./kdeui-kglobalsettingsclient";
proc << opt;
// kDebug() << proc.args();
int ok = proc.execute();

View file

@ -169,10 +169,6 @@ private Q_SLOTS:
// Now load kdialog again, to use the real kiconcache
iconPath2 = appIconLoader.iconPath("kdialog", KIconLoader::User);
QCOMPARE(iconPath, iconPath2);
appIconLoader.addAppDir( "khtml" );
QString iconPathFail = appIconLoader.iconPath("fail", KIconLoader::User);
QVERIFY( iconPathFail.endsWith( "khtml/pics/fail.xpm"));
}
void testAppPicsDir_KIcon()