From 493af006c7f6d2228cdf694b28a54bd00d4f3eab Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 11 May 2009 11:39:50 +0200
Subject: [PATCH] property and signal are keywords in QML.
---
src/plugins/duieditor/duieditor.cpp | 2 --
src/plugins/duieditor/duihighlighter.cpp | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/duieditor/duieditor.cpp b/src/plugins/duieditor/duieditor.cpp
index e07dd584744..9f361cbb400 100644
--- a/src/plugins/duieditor/duieditor.cpp
+++ b/src/plugins/duieditor/duieditor.cpp
@@ -583,8 +583,6 @@ QStringList ScriptEditor::keywords() const
if (DuiHighlighter *highlighter = qobject_cast<DuiHighlighter*>(baseTextDocument()->syntaxHighlighter())) {
words = highlighter->keywords().toList();
- words.append(QLatin1String("property")); // ### move
- words.append(QLatin1String("signal")); // ### move
}
return words;
diff --git a/src/plugins/duieditor/duihighlighter.cpp b/src/plugins/duieditor/duihighlighter.cpp
index 7c8d3ec5980..9d71053bb53 100644
--- a/src/plugins/duieditor/duihighlighter.cpp
+++ b/src/plugins/duieditor/duihighlighter.cpp
@@ -40,6 +40,9 @@ DuiHighlighter::DuiHighlighter(QTextDocument *parent) :
setDuiEnabled(true);
m_currentBlockParentheses.reserve(20);
m_braceDepth = 0;
+
+ qscriptKeywords.insert(QLatin1String("property"));
+ qscriptKeywords.insert(QLatin1String("signal"));
}
int DuiHighlighter::onBlockStart()
--
GitLab