From 01dc62b0196765aa36f841c531c1492fa45712d9 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 29 Sep 2023 07:42:36 +0200 Subject: [PATCH] Editor: Fix loading color schemes When the user switched to another builtin color scheme the full paths check do not match anymore if the user starts a Qt Creator with a different install dir. Change-Id: I4692c85a23a7d524497786db4dd8e1a00bb7a9fe Reviewed-by: Christian Stenger --- src/plugins/texteditor/fontsettingspage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index 654a3a19b20..bdd899b7e04 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -700,7 +700,7 @@ void FontSettingsPageWidget::refreshColorSchemeList() int selected = 0; for (const FilePath &file : std::as_const(schemeList)) { - if (m_value.colorSchemeFileName() == file) + if (m_value.colorSchemeFileName().fileName() == file.fileName()) selected = colorSchemes.size(); colorSchemes.append(ColorSchemeEntry(file, true)); } @@ -710,7 +710,7 @@ void FontSettingsPageWidget::refreshColorSchemeList() const FilePaths files = customStylesPath().dirEntries(FileFilter({"*.xml"}, QDir::Files)); for (const FilePath &file : files) { - if (m_value.colorSchemeFileName() == file) + if (m_value.colorSchemeFileName().fileName() == file.fileName()) selected = colorSchemes.size(); colorSchemes.append(ColorSchemeEntry(file, false)); }