diff options
| author | adisbladis <adis@blad.is> | 2018-01-14 22:28:23 +0800 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2018-01-14 22:28:34 +0800 |
| commit | ef2591ee0183e8fe5ccb42765a8a69cdf3e48d86 (patch) | |
| tree | 3765fc1b8cf9097878d0afc38418fa1c9bac187d /pkgs/development/libraries/kde-frameworks/kconfigwidgets | |
| parent | a6af522217275bfec452bf66102926523758ed2d (diff) | |
| download | nixpkgs-ef2591ee0183e8fe5ccb42765a8a69cdf3e48d86.tar nixpkgs-ef2591ee0183e8fe5ccb42765a8a69cdf3e48d86.tar.gz nixpkgs-ef2591ee0183e8fe5ccb42765a8a69cdf3e48d86.tar.bz2 nixpkgs-ef2591ee0183e8fe5ccb42765a8a69cdf3e48d86.tar.lz nixpkgs-ef2591ee0183e8fe5ccb42765a8a69cdf3e48d86.tar.xz nixpkgs-ef2591ee0183e8fe5ccb42765a8a69cdf3e48d86.tar.zst nixpkgs-ef2591ee0183e8fe5ccb42765a8a69cdf3e48d86.zip | |
kde-frameworks: 5.41 -> 5.42
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks/kconfigwidgets')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch index 7a6c0ee9053..3b6ea27d41e 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch @@ -1,25 +1,18 @@ -From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 06:47:01 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - src/khelpclient.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 +index fbbc0fa..cb78741 100644 --- a/src/khelpclient.cpp +++ b/src/khelpclient.cpp @@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) QString docPath; const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { + for (const QString &dir : desktopDirs) { - QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); + QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { const QString desktopPath(it.next()); KDesktopFile desktopFile(desktopPath); --- -2.5.2 - +@@ -75,4 +75,3 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) + // launch khelpcenter, or a browser for URIs not handled by khelpcenter + QDesktopServices::openUrl(url); + } +- |