kwindowsystem: fix patch

This commit is contained in:
nyanloutre 2019-11-14 01:26:20 +01:00
parent e38a29668f
commit 75f8706806
No known key found for this signature in database
GPG Key ID: 194A92D1103ACB2A

View File

@ -1,17 +1,19 @@
diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp
index 8e6298a..210989a 100644
--- a/src/pluginwrapper.cpp
+++ b/src/pluginwrapper.cpp
@@ -37,14 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapper, s_pluginWrapper)
Index: kwindowsystem-5.64.0/src/pluginwrapper.cpp
===================================================================
--- kwindowsystem-5.64.0.orig/src/pluginwrapper.cpp
+++ kwindowsystem-5.64.0/src/pluginwrapper.cpp
@@ -37,16 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp
static QStringList pluginCandidates()
{
QStringList ret;
- foreach (const QString &path, QCoreApplication::libraryPaths()) {
- const auto paths = QCoreApplication::libraryPaths();
- for (const QString &path : paths) {
- QDir pluginDir(path + QLatin1String("/kf5/org.kde.kwindowsystem.platforms"));
- if (!pluginDir.exists()) {
- continue;
- }
- foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
- for (const QString &entry : entries) {
- ret << pluginDir.absoluteFilePath(entry);
- }
+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));