Disable krunner-related code from the build
This commit is contained in:
parent
62b344680d
commit
bf03242380
@ -1,7 +1,7 @@
|
||||
add_subdirectory(core)
|
||||
add_subdirectory(dirmodel)
|
||||
add_subdirectory(draganddrop)
|
||||
add_subdirectory(krunnermodel)
|
||||
#add_subdirectory(krunnermodel)
|
||||
add_subdirectory(qtextracomponents)
|
||||
add_subdirectory(plasmacomponents)
|
||||
add_subdirectory(plasmaextracomponents)
|
||||
|
@ -25,7 +25,7 @@ set(corebindings_SRCS
|
||||
datamodel.cpp
|
||||
datasource.cpp
|
||||
dialogshadows.cpp
|
||||
runnermodel.cpp
|
||||
# runnermodel.cpp
|
||||
svgitem.cpp
|
||||
framesvgitem.cpp
|
||||
dialog.cpp
|
||||
|
@ -93,11 +93,11 @@ void CoreBindingsPlugin::registerTypes(const char *uri)
|
||||
qRegisterMetaType<Plasma::ServiceJob*>("ServiceJob");
|
||||
qmlRegisterType<ServiceOperationStatus>(uri, 2, 0, "ServiceOperationStatus");
|
||||
qmlRegisterType<QAbstractItemModel>();
|
||||
|
||||
#if 0
|
||||
qmlRegisterType<RunnerModel>(uri, 2, 0, "RunnerModel");
|
||||
qmlRegisterInterface<Plasma::QueryMatch>("QueryMatch");
|
||||
qRegisterMetaType<Plasma::QueryMatch *>("QueryMatch");
|
||||
|
||||
#endif
|
||||
qmlRegisterType<QQmlPropertyMap>();
|
||||
qmlRegisterType<IconItem>(uri, 2, 0, "IconItem");
|
||||
|
||||
|
@ -26,14 +26,14 @@ target_link_libraries(sortfiltermodeltest
|
||||
add_test(plasma-sortfiltermodeltest sortfiltermodeltest)
|
||||
ecm_mark_as_test(sortfiltermodeltest)
|
||||
|
||||
set(runnermodeltest_SRCS
|
||||
main.cpp
|
||||
dynamictreemodel.cpp
|
||||
modeltest.cpp
|
||||
../runnermodel.cpp
|
||||
)
|
||||
#set(runnermodeltest_SRCS
|
||||
# main.cpp
|
||||
# dynamictreemodel.cpp
|
||||
# modeltest.cpp
|
||||
# ../runnermodel.cpp
|
||||
# )
|
||||
|
||||
qt4_automoc(${runnermodeltest_SRCS})
|
||||
add_executable(runnermodeltest ${runnermodeltest_SRCS})
|
||||
target_link_libraries(runnermodeltest ${QT_QTTEST_LIBRARY} ${plasma_LIBRARIES} plasma)
|
||||
ecm_mark_as_test(runnermodeltest)
|
||||
#qt4_automoc(${runnermodeltest_SRCS})
|
||||
#add_executable(runnermodeltest ${runnermodeltest_SRCS})
|
||||
#target_link_libraries(runnermodeltest ${QT_QTTEST_LIBRARY} ${plasma_LIBRARIES} plasma)
|
||||
#ecm_mark_as_test(runnermodeltest)
|
||||
|
@ -73,12 +73,12 @@ set(plasma_LIB_SRCS
|
||||
private/componentinstaller.cpp
|
||||
|
||||
#runners
|
||||
abstractrunner.cpp
|
||||
querymatch.cpp
|
||||
runnercontext.cpp
|
||||
runnermanager.cpp
|
||||
runnersyntax.cpp
|
||||
private/runnerjobs.cpp
|
||||
# abstractrunner.cpp
|
||||
# querymatch.cpp
|
||||
# runnercontext.cpp
|
||||
# runnermanager.cpp
|
||||
# runnersyntax.cpp
|
||||
# private/runnerjobs.cpp
|
||||
|
||||
#applets,containments,corona
|
||||
applet.cpp
|
||||
@ -117,7 +117,7 @@ set(plasma_LIB_SRCS
|
||||
#scripting
|
||||
scripting/appletscript.cpp
|
||||
scripting/dataenginescript.cpp
|
||||
scripting/runnerscript.cpp
|
||||
# scripting/runnerscript.cpp
|
||||
scripting/scriptengine.cpp
|
||||
)
|
||||
|
||||
@ -219,7 +219,7 @@ install(DIRECTORY
|
||||
install(FILES
|
||||
scripting/appletscript.h
|
||||
scripting/dataenginescript.h
|
||||
scripting/runnerscript.h
|
||||
#scripting/runnerscript.h
|
||||
scripting/scriptengine.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/scripting COMPONENT Devel)
|
||||
|
||||
|
@ -32,7 +32,7 @@ PLASMA_UNIT_TESTS(
|
||||
packagestructuretest
|
||||
pluginloadertest
|
||||
# plasmoidpackagetest
|
||||
runnercontexttest
|
||||
#runnercontexttest
|
||||
)
|
||||
|
||||
add_executable(storagetest storagetest.cpp ../private/storage.cpp ../private/storagethread.cpp)
|
||||
|
@ -37,7 +37,7 @@
|
||||
//Plasma
|
||||
#include "applet.h"
|
||||
#include "dataengine.h"
|
||||
#include "abstractrunner.h"
|
||||
//#include "abstractrunner.h"
|
||||
#include "storagethread_p.h"
|
||||
|
||||
|
||||
@ -138,12 +138,13 @@ Storage::Storage(QObject* parent)
|
||||
m_clientName = engine->pluginInfo().pluginName();
|
||||
break;
|
||||
}
|
||||
|
||||
#if 0
|
||||
Plasma::AbstractRunner *runner = qobject_cast<Plasma::AbstractRunner *>(parentObject);
|
||||
if (runner) {
|
||||
m_clientName = runner->id();
|
||||
break;
|
||||
}
|
||||
#endif 0
|
||||
}
|
||||
|
||||
m_clientName = m_clientName.replace('.', "_");
|
||||
|
@ -84,7 +84,7 @@ QStringList knownLanguages(Types::ComponentTypes types)
|
||||
|
||||
constraint.append(constraintTemplate.arg("DataEngine"));
|
||||
}
|
||||
|
||||
#if 0
|
||||
if (types & Types::RunnerComponent) {
|
||||
if (!constraint.isEmpty()) {
|
||||
constraint.append(" or ");
|
||||
@ -92,7 +92,7 @@ QStringList knownLanguages(Types::ComponentTypes types)
|
||||
|
||||
constraint.append(constraintTemplate.arg("Runner"));
|
||||
}
|
||||
|
||||
#endif
|
||||
KService::List offers = KServiceTypeTrader::self()->query("Plasma/ScriptEngine", constraint);
|
||||
//qDebug() << "Applet::knownApplets constraint was '" << constraint
|
||||
// << "' which got us " << offers.count() << " matches";
|
||||
@ -168,9 +168,11 @@ ScriptEngine *loadEngine(const QString &language, Types::ComponentType type, QOb
|
||||
case Types::DataEngineComponent:
|
||||
engine = service->createInstance<Plasma::DataEngineScript>(parent, args, &error);
|
||||
break;
|
||||
#if 0
|
||||
case Types::RunnerComponent:
|
||||
engine = service->createInstance<Plasma::RunnerScript>(parent, args, &error);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
return 0;
|
||||
break;
|
||||
@ -221,7 +223,7 @@ RunnerScript *loadScriptEngine(const QString &language, AbstractRunner *runner)
|
||||
RunnerScript *engine = static_cast<RunnerScript*>(loadEngine(language, Types::RunnerComponent, runner));
|
||||
|
||||
if (engine) {
|
||||
engine->setRunner(runner);
|
||||
//engine->setRunner(runner);
|
||||
}
|
||||
|
||||
return engine;
|
||||
|
Loading…
Reference in New Issue
Block a user