From bf03242380784c88a5be1c5de8e4e585c3710799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Tue, 8 Oct 2013 17:37:15 +0200 Subject: [PATCH] Disable krunner-related code from the build --- src/declarativeimports/CMakeLists.txt | 2 +- src/declarativeimports/core/CMakeLists.txt | 2 +- .../core/corebindingsplugin.cpp | 4 ++-- .../core/tests/CMakeLists.txt | 20 +++++++++---------- src/plasma/CMakeLists.txt | 16 +++++++-------- src/plasma/autotests/CMakeLists.txt | 2 +- src/plasma/private/storage.cpp | 5 +++-- src/plasma/scripting/scriptengine.cpp | 8 +++++--- 8 files changed, 31 insertions(+), 28 deletions(-) diff --git a/src/declarativeimports/CMakeLists.txt b/src/declarativeimports/CMakeLists.txt index b317df2a1..e5f08808a 100644 --- a/src/declarativeimports/CMakeLists.txt +++ b/src/declarativeimports/CMakeLists.txt @@ -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) diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt index bad098fa4..491dd6b87 100644 --- a/src/declarativeimports/core/CMakeLists.txt +++ b/src/declarativeimports/core/CMakeLists.txt @@ -25,7 +25,7 @@ set(corebindings_SRCS datamodel.cpp datasource.cpp dialogshadows.cpp - runnermodel.cpp + # runnermodel.cpp svgitem.cpp framesvgitem.cpp dialog.cpp diff --git a/src/declarativeimports/core/corebindingsplugin.cpp b/src/declarativeimports/core/corebindingsplugin.cpp index 5bf261411..6950b129c 100644 --- a/src/declarativeimports/core/corebindingsplugin.cpp +++ b/src/declarativeimports/core/corebindingsplugin.cpp @@ -93,11 +93,11 @@ void CoreBindingsPlugin::registerTypes(const char *uri) qRegisterMetaType("ServiceJob"); qmlRegisterType(uri, 2, 0, "ServiceOperationStatus"); qmlRegisterType(); - +#if 0 qmlRegisterType(uri, 2, 0, "RunnerModel"); qmlRegisterInterface("QueryMatch"); qRegisterMetaType("QueryMatch"); - +#endif qmlRegisterType(); qmlRegisterType(uri, 2, 0, "IconItem"); diff --git a/src/declarativeimports/core/tests/CMakeLists.txt b/src/declarativeimports/core/tests/CMakeLists.txt index 68458d585..6dc410c0b 100644 --- a/src/declarativeimports/core/tests/CMakeLists.txt +++ b/src/declarativeimports/core/tests/CMakeLists.txt @@ -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) diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index 41924c96b..411256a1e 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -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) diff --git a/src/plasma/autotests/CMakeLists.txt b/src/plasma/autotests/CMakeLists.txt index 2b4cf99d4..df29add2f 100644 --- a/src/plasma/autotests/CMakeLists.txt +++ b/src/plasma/autotests/CMakeLists.txt @@ -32,7 +32,7 @@ PLASMA_UNIT_TESTS( packagestructuretest pluginloadertest # plasmoidpackagetest - runnercontexttest + #runnercontexttest ) add_executable(storagetest storagetest.cpp ../private/storage.cpp ../private/storagethread.cpp) diff --git a/src/plasma/private/storage.cpp b/src/plasma/private/storage.cpp index c8a06e1b1..35b222e8b 100644 --- a/src/plasma/private/storage.cpp +++ b/src/plasma/private/storage.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(parentObject); if (runner) { m_clientName = runner->id(); break; } +#endif 0 } m_clientName = m_clientName.replace('.', "_"); diff --git a/src/plasma/scripting/scriptengine.cpp b/src/plasma/scripting/scriptengine.cpp index 66b3aa19d..2a0dfd926 100644 --- a/src/plasma/scripting/scriptengine.cpp +++ b/src/plasma/scripting/scriptengine.cpp @@ -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(parent, args, &error); break; +#if 0 case Types::RunnerComponent: engine = service->createInstance(parent, args, &error); break; +#endif default: return 0; break; @@ -221,7 +223,7 @@ RunnerScript *loadScriptEngine(const QString &language, AbstractRunner *runner) RunnerScript *engine = static_cast(loadEngine(language, Types::RunnerComponent, runner)); if (engine) { - engine->setRunner(runner); + //engine->setRunner(runner); } return engine;