kwindowsystem: fix patch
This commit is contained in:
parent
e38a29668f
commit
75f8706806
@ -1,17 +1,19 @@
|
|||||||
diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp
|
Index: kwindowsystem-5.64.0/src/pluginwrapper.cpp
|
||||||
index 8e6298a..210989a 100644
|
===================================================================
|
||||||
--- a/src/pluginwrapper.cpp
|
--- kwindowsystem-5.64.0.orig/src/pluginwrapper.cpp
|
||||||
+++ b/src/pluginwrapper.cpp
|
+++ kwindowsystem-5.64.0/src/pluginwrapper.cpp
|
||||||
@@ -37,14 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapper, s_pluginWrapper)
|
@@ -37,16 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp
|
||||||
static QStringList pluginCandidates()
|
static QStringList pluginCandidates()
|
||||||
{
|
{
|
||||||
QStringList ret;
|
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"));
|
- QDir pluginDir(path + QLatin1String("/kf5/org.kde.kwindowsystem.platforms"));
|
||||||
- if (!pluginDir.exists()) {
|
- if (!pluginDir.exists()) {
|
||||||
- continue;
|
- 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);
|
- ret << pluginDir.absoluteFilePath(entry);
|
||||||
- }
|
- }
|
||||||
+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
|
+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user