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

Merge commit '163b64072778fc5289f53a0502c0a5e2ed930a03' into frameworks

Browse Source 
Conflicts:
	kioslave/http/http.cpp
	plasma/pluginloader.cpp
This commit is contained in:
David Faure 2012-12-13 13:10:36 +01:00
commit 806f2c887c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pluginloader.cpp
View File

@ -167,9 +167,7 @@ Applet *PluginLoader::loadApplet(const QString &name, uint appletId, const QVari
applet = offer->createInstance<Plasma::Applet>(0, allArgs, &error); applet = offer->createInstance<Plasma::Applet>(0, allArgs, &error);
if (!applet) { if (!applet) {
#ifndef NDEBUG kWarning() << "Could not load applet" << name << "! reason given:" << error;
kDebug() << "Couldn't load applet \"" << name << "\"! reason given: " << error;
#endif
} }
return applet; return applet;