aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Berres <armin.berres@basyskom.de>2010-08-05 12:08:25 +0200
committerTomas Junnonen <tomas.junnonen@nokia.com>2010-08-06 15:37:44 +0300
commita77f2e55d8f305edc475fc976c7fb16bb869447a (patch)
treecaa751f3624471ba74b22dd40da610fbf1247b8d
parentd6789186faa04a700a5718db15a540d0d6579681 (diff)
Changes: Fix ut_mremotethemedaemon
RevBy: Peter Penz
-rw-r--r--src/corelib/theme/mremotethemedaemon.cpp1
-rw-r--r--tests/ut_mremotethemedaemon/ut_mremotethemedaemon.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/theme/mremotethemedaemon.cpp b/src/corelib/theme/mremotethemedaemon.cpp
index b23457f4..3f38e4e6 100644
--- a/src/corelib/theme/mremotethemedaemon.cpp
+++ b/src/corelib/theme/mremotethemedaemon.cpp
@@ -377,6 +377,7 @@ void MRemoteThemeDaemonPrivate::loadThemeDaemonPriorities(const QString& filenam
priorityForegroundApplication = 100;
priorityBackgroundApplication = 0;
priorityPrestartedApplication = -10;
+ applicationSpecificPriorities.clear();
QSettings settings(filename, QSettings::IniFormat);
if(settings.status() != QSettings::NoError) {
diff --git a/tests/ut_mremotethemedaemon/ut_mremotethemedaemon.cpp b/tests/ut_mremotethemedaemon/ut_mremotethemedaemon.cpp
index b6d22826..2d64394a 100644
--- a/tests/ut_mremotethemedaemon/ut_mremotethemedaemon.cpp
+++ b/tests/ut_mremotethemedaemon/ut_mremotethemedaemon.cpp
@@ -143,7 +143,7 @@ void Ut_MRemoteThemeDaemon::testLoadThemeDaemonPriorities_data()
priorities.insert("sysuid", -90);
priorities.insert("duihome", 23);
priorities.insert("meego-im-uiserver", 55);
- QTest::newRow("valid") << QString("priorities.conf") << 3 << 7 << -100 << priorities;
+ QTest::newRow("valid") << QString(m_app->applicationDirPath() + QLatin1String("/priorities.conf")) << 3 << 7 << -100 << priorities;
}
typedef QHash<QString, qint32> StringIntHash;