From 6328ff00386347451f160c169a48f3bb42a8bfc9 Mon Sep 17 00:00:00 2001
From: Leandro Melo <leandro.melo@nokia.com>
Date: Thu, 23 Sep 2010 16:38:53 +0200
Subject: [PATCH] Generic highlighter: Default to use fallback only if
pre-installed definitions were found.
---
.../generichighlighter/highlightersettings.cpp | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
index dd975c07930..758d8b1b940 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
@@ -139,12 +139,17 @@ void HighlighterSettings::fromSettings(const QString &category, QSettings *s)
QLatin1String("/generic-highlighter");
else
m_definitionFilesPath = s->value(kDefinitionFilesPath).toString();
- if (!s->contains(kFallbackDefinitionFilesPath))
+ if (!s->contains(kFallbackDefinitionFilesPath)) {
m_fallbackDefinitionFilesPath = findDefinitionsLocation();
- else
+ if (m_fallbackDefinitionFilesPath.isEmpty())
+ m_useFallbackLocation = false;
+ else
+ m_useFallbackLocation = true;
+ } else {
m_fallbackDefinitionFilesPath = s->value(kFallbackDefinitionFilesPath).toString();
+ m_useFallbackLocation = s->value(kUseFallbackLocation, true).toBool();
+ }
m_alertWhenNoDefinition = s->value(kAlertWhenDefinitionIsNotFound, true).toBool();
- m_useFallbackLocation = s->value(kUseFallbackLocation, true).toBool();
if (!s->contains(kIgnoredFilesPatterns))
assignInitialIgnoredPatterns();
else
--
GitLab