alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

REVIEW: 101342

Browse Source 
Merge branch 'whiting/buildwithqt48'
This commit is contained in:
Jeremy Whiting 2011-05-16 12:46:24 -06:00
commit 4d8d36b195
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
private/serviceprovider_p.h
View File

@ -65,7 +65,7 @@ class ServiceProvider : public Jolie::AbstractAdaptor
QString m_providerName; QString m_providerName;
QMap<ServiceJob*, Jolie::Message> m_messageMap; QMap<ServiceJob*, Jolie::Message> m_messageMap;
QMap<QString, QByteArray> m_tokens; QMap<QByteArray, QByteArray> m_tokens;
QMap<QByteArray, int> m_descriptorMap; QMap<QByteArray, int> m_descriptorMap;
QList<Jolie::Message> m_messagesPendingAuthorization; QList<Jolie::Message> m_messagesPendingAuthorization;

8
tests/plasmoidpackagetest.cpp
View File

@ -51,10 +51,10 @@ void PlasmoidPackageTest::cleanup()
// Clean things up. // Clean things up.
QDir local(QDir::homePath() + QLatin1String("/.kde-unit-test/packageRoot")); QDir local(QDir::homePath() + QLatin1String("/.kde-unit-test/packageRoot"));
foreach (const QString &dir, local.entryList(QDir::Dirs)) { foreach (const QString &dir, local.entryList(QDir::Dirs)) {
removeDir(QLatin1String("packageRoot/" + dir.toLatin1() + "/contents/code")); removeDir(QLatin1String("packageRoot/") + dir.toLatin1() + "/contents/code");
removeDir(QLatin1String("packageRoot/" + dir.toLatin1() + "/contents/images")); removeDir(QLatin1String("packageRoot/") + dir.toLatin1() + "/contents/images");
removeDir(QLatin1String("packageRoot/" + dir.toLatin1() + "/contents")); removeDir(QLatin1String("packageRoot/") + dir.toLatin1() + "/contents");
removeDir(QLatin1String("packageRoot/" + dir.toLatin1())); removeDir(QLatin1String("packageRoot/") + dir.toLatin1());
} }
QDir().rmpath(QDir::homePath() + "/.kde-unit-test/packageRoot"); QDir().rmpath(QDir::homePath() + "/.kde-unit-test/packageRoot");