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

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()
new ProjectPreferences(&cfgDlg),
new EnvironmentPreferences(QString(), &cfgDlg),
templateConfig,
documentationPreferences,
analyzersPreferences,
runtimesPreferences,
languageConfigPage,
editorConfigPage
};
......@@ -512,6 +516,8 @@ void UiController::showSettingsDialog()
cfgDlg.appendConfigPage(page);
}
cfgDlg.appendSubConfigPage(languageConfigPage, new BGPreferences(&cfgDlg));
auto addPluginPages = [&](IPlugin* plugin) {
for (int i = 0, numPages = plugin->configPages(); i < numPages; ++i) {
auto page = plugin->configPage(i, &cfgDlg);
......@@ -532,14 +538,10 @@ void UiController::showSettingsDialog()
}
};
cfgDlg.insertConfigPage(templateConfig, documentationPreferences);
cfgDlg.insertConfigPage(documentationPreferences, analyzersPreferences);
cfgDlg.insertConfigPage(analyzersPreferences, runtimesPreferences);
cfgDlg.insertConfigPage(runtimesPreferences, languageConfigPage);
cfgDlg.appendSubConfigPage(languageConfigPage, new BGPreferences(&cfgDlg));
auto plugins = ICore::self()->pluginController()->loadedPlugins();
std::sort(plugins.begin(), plugins.end());
foreach (IPlugin* plugin, ICore::self()->pluginController()->loadedPlugins()) {
foreach (IPlugin* plugin, plugins) {
addPluginPages(plugin);
}
......
......@@ -219,7 +219,7 @@ Path FlatpakRuntime::pathInRuntime(const KDevelop::Path& localPath) const
const auto relpath = m_sdkPath.relativePath(localPath);
ret = Path(Path(QStringLiteral("/usr")), relpath);
} else {
const Path bdfiles(m_buildDirectory, QStringLiteral("/active/flies"));
const Path bdfiles(m_buildDirectory, QStringLiteral("/active/files"));
if (bdfiles.isParentOf(localPath)) {
const auto relpath = bdfiles.relativePath(localPath);
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