kwindowsystem: purify platform plugin detection

This commit is contained in:
Thomas Tuegel
2017-04-18 08:11:17 -05:00
parent bd92780b4c
commit c37220fcf9
4 changed files with 29 additions and 2 deletions

View File

@@ -0,0 +1,22 @@
Index: kwindowsystem-5.32.0/src/pluginwrapper.cpp
===================================================================
--- kwindowsystem-5.32.0.orig/src/pluginwrapper.cpp
+++ kwindowsystem-5.32.0/src/pluginwrapper.cpp
@@ -37,14 +37,9 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp
static QStringList pluginCandidates()
{
QStringList ret;
- foreach (const QString &path, QCoreApplication::libraryPaths()) {
- QDir pluginDir(path + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
- if (!pluginDir.exists()) {
- continue;
- }
- foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
- ret << pluginDir.absoluteFilePath(entry);
- }
+ QDir pluginDir(QStringLiteral(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
+ foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
+ ret << pluginDir.absoluteFilePath(entry);
}
return ret;
}