Differential D19340 Diff 53876 libdiscover/backends/KNSBackend/KNSBackend.cpp

Changeset View

Standalone View

View Options

libdiscover/backends/KNSBackend/KNSBackend.cpp

Context not available.
65 QVector<AbstractResourcesBackend*> newInstance(QObject* parent, const QString &/*name*/) const override 65​ QVector<AbstractResourcesBackend*> newInstance(QObject* parent, const QString &/*name*/) const override
66 { 66​ {
67 QVector<AbstractResourcesBackend*> ret; 67​ QVector<AbstractResourcesBackend*> ret;
68 for (const QString &path: QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) { 68​#if KNEWSTUFFCORE_VERSION_MAJOR==5 && KNEWSTUFFCORE_VERSION_MINOR>=57
69​ QStringList locations = KNSCore::Engine::configSearchLocations();
apolUnsubmitted
Done

Discover should probably not fallback, i.e. pass false as an argument.
Otherwise the problem will persist.

This is Plasma 5.16 and by then we should have all applications within KDE ported. This can be an incentive for the rest to install in the right place.

apol: Discover should probably not fallback, i.e. pass false as an argument. Otherwise the problem…
leinirAuthorUnsubmitted
Done

Hmm! Very good point indeed, we're far enough away for this to be a thing we can sort for the majority of things, and yup, definitely avoids a very great amount of headaches :) i shall swap that and update the patch shortly

leinir: Hmm! Very good point indeed, we're far enough away for this to be a thing we can sort for the…
70​#else
71​ QStringList locations = QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation);
72​#endif
73​ for (const QString &path: locations) {
ngrahamUnsubmitted
Done

Needs to be 57 now (we'll get all of this landed soon, not to worry!)

Also, should the second one be KNEWSTUFFCORE_VERSION_MINOR? Seems weird that both conditions are checking the major version.

ngraham: Needs to be 57 now (we'll get all of this landed soon, not to worry!) Also, should the second…
leinirAuthorUnsubmitted
Done

It does indeed! Good catch before landing time, too :)

wwwwoooow... yes, yes it should, not sure how i missed that :D

leinir: It does indeed! Good catch before landing time, too :) wwwwoooow... yes, yes it should, not…
69 QDirIterator dirIt(path, {QStringLiteral("*.knsrc")}, QDir::Files); 74​ QDirIterator dirIt(path, {QStringLiteral("*.knsrc")}, QDir::Files);
70 for(; dirIt.hasNext(); ) { 75​ for(; dirIt.hasNext(); ) {
71 dirIt.next(); 76​ dirIt.next();
Context not available.