diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,6 @@ find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Plasma ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5Solid ${KF5_DEP_VERSION} REQUIRED) find_package(KF5ThreadWeaver ${KF5_DEP_VERSION} REQUIRED) # Subdirectories diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,7 +34,6 @@ KF5::Service KF5::I18n KF5::ThreadWeaver - KF5::Solid KF5::CoreAddons #KShell KF5::KIOCore #KProtocolInfo ) diff --git a/src/runnermanager.cpp b/src/runnermanager.cpp --- a/src/runnermanager.cpp +++ b/src/runnermanager.cpp @@ -31,9 +31,6 @@ #include #include -#include -#include - #include #include #include @@ -99,20 +96,9 @@ { KConfigGroup config = configGroup(); - //The number of threads used scales with the number of processors. - const int numProcs = - qMax(Solid::Device::listFromType(Solid::DeviceInterface::Processor).count(), 1); - //This entry allows to define a hard upper limit independent of the number of processors. - const int maxThreads = config.readEntry("maxThreads", 16); - const int numThreads = qMin(maxThreads, 2 + ((numProcs - 1) * 2)); - //qCDebug(KRUNNER) << "setting up" << numThreads << "threads for" << numProcs << "processors"; - if (numThreads > Queue::instance()->maximumNumberOfThreads()) { - Queue::instance()->setMaximumNumberOfThreads(numThreads); - } // Limit the number of instances of a single normal speed runner and all of the slow runners // to half the number of threads - const int cap = qMax(2, numThreads/2); - DefaultRunnerPolicy::instance().setCap(cap); + DefaultRunnerPolicy::instance().setCap(qMax(2, Queue::instance()->maximumNumberOfThreads() / 2)); enabledCategories = config.readEntry("enabledCategories", QStringList()); context.restore(config);