From 80474251d77a45c0ec24c0174b4f5f34b03b2b6d Mon Sep 17 00:00:00 2001
From: Leandro Melo <leandro.melo@nokia.com>
Date: Thu, 23 Sep 2010 16:37:09 +0200
Subject: [PATCH] Generic highlighter: Add Creator's default folder for
definitions.
---
share/qtcreator/generic-highlighter/README | 2 ++
share/qtcreator/static.pro | 3 ++-
.../texteditor/generichighlighter/highlightersettings.cpp | 7 ++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 share/qtcreator/generic-highlighter/README
diff --git a/share/qtcreator/generic-highlighter/README b/share/qtcreator/generic-highlighter/README
new file mode 100644
index 00000000000..eb1647a377b
--- /dev/null
+++ b/share/qtcreator/generic-highlighter/README
@@ -0,0 +1,2 @@
+This is Creator's default directory for syntax highlight definitions.
+You can download them through the Generic Highlighter options dialog.
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index 92c0bc40b69..e17a9fa92a5 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -33,7 +33,8 @@ DATA_DIRS = \
qmldesigner \
qmlicons \
qml-type-descriptions \
- qmljsdebugger
+ qmljsdebugger \
+ generic-highlighter
!isEmpty(copydata) {
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
index c62b1339cdf..dd975c07930 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
@@ -134,10 +134,15 @@ void HighlighterSettings::fromSettings(const QString &category, QSettings *s)
const QString &group = groupSpecifier(kGroupPostfix, category);
s->beginGroup(group);
m_definitionFilesPath = s->value(kDefinitionFilesPath, QString()).toString();
+ if (!s->contains(kDefinitionFilesPath))
+ m_definitionFilesPath = Core::ICore::instance()->resourcePath() +
+ QLatin1String("/generic-highlighter");
+ else
+ m_definitionFilesPath = s->value(kDefinitionFilesPath).toString();
if (!s->contains(kFallbackDefinitionFilesPath))
m_fallbackDefinitionFilesPath = findDefinitionsLocation();
else
- m_fallbackDefinitionFilesPath = s->value(kFallbackDefinitionFilesPath,QString()).toString();
+ m_fallbackDefinitionFilesPath = s->value(kFallbackDefinitionFilesPath).toString();
m_alertWhenNoDefinition = s->value(kAlertWhenDefinitionIsNotFound, true).toBool();
m_useFallbackLocation = s->value(kUseFallbackLocation, true).toBool();
if (!s->contains(kIgnoredFilesPatterns))
--
GitLab