* support TryExec
* fix include order svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=866331
This commit is contained in:
parent
1b266963bb
commit
443a3b3352
@ -21,9 +21,14 @@
|
|||||||
|
|
||||||
#include "runnermanager.h"
|
#include "runnermanager.h"
|
||||||
|
|
||||||
#include <KServiceTypeTrader>
|
#include <QMutex>
|
||||||
#include <KPluginInfo>
|
#include <QTimer>
|
||||||
|
#include <QCoreApplication>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <KDebug>
|
||||||
|
#include <KPluginInfo>
|
||||||
|
#include <KServiceTypeTrader>
|
||||||
|
#include <KStandardDirs>
|
||||||
|
|
||||||
#include <Solid/Device>
|
#include <Solid/Device>
|
||||||
#include <Solid/DeviceInterface>
|
#include <Solid/DeviceInterface>
|
||||||
@ -33,9 +38,6 @@
|
|||||||
#include <ThreadWeaver/Job>
|
#include <ThreadWeaver/Job>
|
||||||
#include <ThreadWeaver/QueuePolicy>
|
#include <ThreadWeaver/QueuePolicy>
|
||||||
#include <ThreadWeaver/Weaver>
|
#include <ThreadWeaver/Weaver>
|
||||||
#include <QMutex>
|
|
||||||
#include <QTimer>
|
|
||||||
#include <QCoreApplication>
|
|
||||||
|
|
||||||
#include "querymatch.h"
|
#include "querymatch.h"
|
||||||
|
|
||||||
@ -227,6 +229,13 @@ public:
|
|||||||
|
|
||||||
foreach (const KService::Ptr &service, offers) {
|
foreach (const KService::Ptr &service, offers) {
|
||||||
//kDebug() << "Loading runner: " << service->name() << service->storageId();
|
//kDebug() << "Loading runner: " << service->name() << service->storageId();
|
||||||
|
QString tryExec = service->property("TryExec", QVariant::String).toString();
|
||||||
|
kDebug() << "tryExec is" << tryExec;
|
||||||
|
if (!tryExec.isEmpty() && KStandardDirs::findExe(tryExec).isEmpty()) {
|
||||||
|
// we don't actually have this application!
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
KPluginInfo description(service);
|
KPluginInfo description(service);
|
||||||
QString runnerName = description.pluginName();
|
QString runnerName = description.pluginName();
|
||||||
description.load(conf);
|
description.load(conf);
|
||||||
|
Loading…
Reference in New Issue
Block a user