forked from qt-creator/qt-creator
Forked QSyntaxHighlighter from Qt 4.7.
We need our very own syntax highlighter in Qt Creator.
This commit is contained in:
@@ -60,6 +60,7 @@
|
||||
#include <texteditor/textblockiterator.h>
|
||||
#include <texteditor/texteditorconstants.h>
|
||||
#include <texteditor/texteditorsettings.h>
|
||||
#include <texteditor/syntaxhighlighter.h>
|
||||
#include <qmldesigner/qmldesignerconstants.h>
|
||||
#include <utils/changeset.h>
|
||||
#include <utils/uncommentselection.h>
|
||||
|
||||
@@ -39,7 +39,7 @@ using namespace QmlJSEditor;
|
||||
using namespace QmlJS;
|
||||
|
||||
Highlighter::Highlighter(QTextDocument *parent)
|
||||
: QSyntaxHighlighter(parent),
|
||||
: TextEditor::SyntaxHighlighter(parent),
|
||||
m_qmlEnabled(true),
|
||||
m_inMultilineComment(false)
|
||||
{
|
||||
|
||||
@@ -39,10 +39,11 @@
|
||||
#include <QtGui/QSyntaxHighlighter>
|
||||
|
||||
#include <texteditor/basetextdocumentlayout.h>
|
||||
#include <texteditor/syntaxhighlighter.h>
|
||||
|
||||
namespace QmlJSEditor {
|
||||
|
||||
class QMLJSEDITOR_EXPORT Highlighter : public QSyntaxHighlighter
|
||||
class QMLJSEDITOR_EXPORT Highlighter : public TextEditor::SyntaxHighlighter
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
Reference in New Issue
Block a user