Merge branch 'master' into kf6

[dolphin.git] / src / settings / contextmenu / contextmenusettingspage.cpp

diff --git a/src/settings/contextmenu/contextmenusettingspage.cpp b/src/settings/contextmenu/contextmenusettingspage.cpp
index daf15bc1b3e98b34c7d68606a9922cc498780d73..78d8ccf8aef30b8a006c54d0093379aa7196e4d7 100644 (file)
--- a/src/settings/contextmenu/contextmenusettingspage.cpp
+++ b/src/settings/contextmenu/contextmenusettingspage.cpp
@@ -128,6 +128,10 @@ bool ContextMenuSettingsPage::entryVisible(const QString &id)
         return ContextMenuSettings::showDuplicateHere();
     } else if (id == "open_terminal_here") {
         return ContextMenuSettings::showOpenTerminal();
+    } else if (id == "copy_to_inactive_split_view") {
+        return ContextMenuSettings::showCopyToOtherSplitView();
+    } else if (id == "move_to_inactive_split_view") {
+        return ContextMenuSettings::showMoveToOtherSplitView();
     }
     return false;
 }
@@ -150,6 +154,10 @@ void ContextMenuSettingsPage::setEntryVisible(const QString &id, bool visible)
         ContextMenuSettings::setShowDuplicateHere(visible);
     } else if (id == "open_terminal_here") {
         ContextMenuSettings::setShowOpenTerminal(visible);
+    } else if (id == "copy_to_inactive_split_view") {
+        ContextMenuSettings::setShowCopyToOtherSplitView(visible);
+    } else if (id == "move_to_inactive_split_view") {
+        ContextMenuSettings::setShowMoveToOtherSplitView(visible);
     }
 }
 
@@ -300,7 +308,7 @@ void ContextMenuSettingsPage::loadServices()
     }
 
     // Load JSON-based plugins that implement the KFileItemActionPlugin interface
-    const auto jsonPlugins = KPluginMetaData::findPlugins(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kfileitemaction"));
+    const auto jsonPlugins = KPluginMetaData::findPlugins(QStringLiteral("kf" QT_STRINGIFY(QT_MAJOR_VERSION)) + QStringLiteral("/kfileitemaction"));
 
     for (const auto &jsonMetadata : jsonPlugins) {
         const QString desktopEntryName = jsonMetadata.pluginId();