Commit 9061a828 authored by Leandro Melo's avatar Leandro Melo

Fix highlighter engine unit tests compilation/linking.

parent e306254f
......@@ -2,13 +2,11 @@ QT += gui
CONFIG += qtestlib testcase
PLUGINSDIR = ../../../../src/plugins
TEXTEDITORDIR = $$PLUGINSDIR/texteditor
GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter
SOURCES += tst_highlighterengine.cpp \
highlightermock.cpp \
formats.cpp \
$$TEXTEDITORDIR/syntaxhighlighter.cpp \
$$GENERICHIGHLIGHTERDIR/highlighter.cpp \
$$GENERICHIGHLIGHTERDIR/context.cpp \
$$GENERICHIGHLIGHTERDIR/dynamicrule.cpp \
......@@ -24,7 +22,7 @@ HEADERS += \
basetextdocumentlayout.h \
formats.h \
tabsettings.h \
$$TEXTEDITORDIR/syntaxhighlighter.h \
texteditor/syntaxhighlighter.h \
$$GENERICHIGHLIGHTERDIR/highlighter.h \
$$GENERICHIGHLIGHTERDIR/context.h \
$$GENERICHIGHLIGHTERDIR/dynamicrule.h \
......@@ -35,6 +33,6 @@ HEADERS += \
$$GENERICHIGHLIGHTERDIR/keywordlist.h \
$$GENERICHIGHLIGHTERDIR/itemdata.h
INCLUDEPATH += $$GENERICHIGHLIGHTERDIR $$PLUGINSDIR $$TEXTEDITORDIR
INCLUDEPATH += $$GENERICHIGHLIGHTERDIR
TARGET=tst_$$TARGET
......@@ -36,8 +36,9 @@
namespace TextEditor {
struct TabSettings
class TabSettings
{
public:
int indentationColumn(const QString &) const { return 0; }
};
......
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
#ifndef SYNTAXHIGHLIGHTER_H
#define SYNTAXHIGHLIGHTER_H
// Replaces the "real" syntaxhighlighter.h file. The scope of this test is restricted to the
// highlight definition's context engine. Using QSyntaxHighlighter as a base instead of the
// real TextEditor::SyntaxHighlighter should not affect it.
#include <QtGui/QSyntaxHighlighter>
namespace TextEditor {
typedef QSyntaxHighlighter SyntaxHighlighter;
}
#endif //SYNTAXHIGHLIGHTER_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment