Commit 0d8a820b authored by Milian Wolff's avatar Milian Wolff
Browse files

Merge remote-tracking branch 'gitlab/5.3'

parents 7171ab04 e8b3ee4a
Pipeline #2168 failed with stage
in 60 minutes
...@@ -505,6 +505,10 @@ void UiController::showSettingsDialog() ...@@ -505,6 +505,10 @@ void UiController::showSettingsDialog()
new ProjectPreferences(&cfgDlg), new ProjectPreferences(&cfgDlg),
new EnvironmentPreferences(QString(), &cfgDlg), new EnvironmentPreferences(QString(), &cfgDlg),
templateConfig, templateConfig,
documentationPreferences,
analyzersPreferences,
runtimesPreferences,
languageConfigPage,
editorConfigPage editorConfigPage
}; };
...@@ -512,6 +516,8 @@ void UiController::showSettingsDialog() ...@@ -512,6 +516,8 @@ void UiController::showSettingsDialog()
cfgDlg.appendConfigPage(page); cfgDlg.appendConfigPage(page);
} }
cfgDlg.appendSubConfigPage(languageConfigPage, new BGPreferences(&cfgDlg));
auto addPluginPages = [&](IPlugin* plugin) { auto addPluginPages = [&](IPlugin* plugin) {
for (int i = 0, numPages = plugin->configPages(); i < numPages; ++i) { for (int i = 0, numPages = plugin->configPages(); i < numPages; ++i) {
auto page = plugin->configPage(i, &cfgDlg); auto page = plugin->configPage(i, &cfgDlg);
...@@ -532,14 +538,10 @@ void UiController::showSettingsDialog() ...@@ -532,14 +538,10 @@ void UiController::showSettingsDialog()
} }
}; };
cfgDlg.insertConfigPage(templateConfig, documentationPreferences); auto plugins = ICore::self()->pluginController()->loadedPlugins();
cfgDlg.insertConfigPage(documentationPreferences, analyzersPreferences); std::sort(plugins.begin(), plugins.end());
cfgDlg.insertConfigPage(analyzersPreferences, runtimesPreferences);
cfgDlg.insertConfigPage(runtimesPreferences, languageConfigPage);
cfgDlg.appendSubConfigPage(languageConfigPage, new BGPreferences(&cfgDlg));
foreach (IPlugin* plugin, ICore::self()->pluginController()->loadedPlugins()) { foreach (IPlugin* plugin, plugins) {
addPluginPages(plugin); addPluginPages(plugin);
} }
......
...@@ -219,7 +219,7 @@ Path FlatpakRuntime::pathInRuntime(const KDevelop::Path& localPath) const ...@@ -219,7 +219,7 @@ Path FlatpakRuntime::pathInRuntime(const KDevelop::Path& localPath) const
const auto relpath = m_sdkPath.relativePath(localPath); const auto relpath = m_sdkPath.relativePath(localPath);
ret = Path(Path(QStringLiteral("/usr")), relpath); ret = Path(Path(QStringLiteral("/usr")), relpath);
} else { } else {
const Path bdfiles(m_buildDirectory, QStringLiteral("/active/flies")); const Path bdfiles(m_buildDirectory, QStringLiteral("/active/files"));
if (bdfiles.isParentOf(localPath)) { if (bdfiles.isParentOf(localPath)) {
const auto relpath = bdfiles.relativePath(localPath); const auto relpath = bdfiles.relativePath(localPath);
ret = Path(Path(QStringLiteral("/app")), relpath); ret = Path(Path(QStringLiteral("/app")), relpath);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment