diff options
author | Leandro Melo <leandro.melo@nokia.com> | 2010-09-23 16:37:09 +0200 |
---|---|---|
committer | Leandro Melo <leandro.melo@nokia.com> | 2010-09-23 17:08:32 +0200 |
commit | 80474251d77a45c0ec24c0174b4f5f34b03b2b6d (patch) | |
tree | 087bf32f292cf5cb33694fb335e775fe04bf63a5 /src/plugins/texteditor/generichighlighter/highlightersettings.cpp | |
parent | c374fefa28dcfb1842f079dca31bd9253035fbd0 (diff) | |
download | qt-creator-80474251d77a45c0ec24c0174b4f5f34b03b2b6d.tar.gz |
Generic highlighter: Add Creator's default folder for definitions.
Diffstat (limited to 'src/plugins/texteditor/generichighlighter/highlightersettings.cpp')
-rw-r--r-- | src/plugins/texteditor/generichighlighter/highlightersettings.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp index c62b1339cd..dd975c0793 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)) |