summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2018-09-19 15:09:11 +0200
committerNikolai Kosjar <nikolai.kosjar@qt.io>2018-09-20 06:12:33 +0000
commit9dea4c0743c5ef9dac56c2e60b6038c942619fbc (patch)
treef28fd256c0d5b8da7655fe9684200fcd5951d858 /tests/auto
parentb9e39ed5e0855536148b224f8593ebb160161ddb (diff)
downloadqt-creator-9dea4c0743c5ef9dac56c2e60b6038c942619fbc.tar.gz
Tests: Fix generichighlighter/highlighterengine test
highlighter.cpp: In member function ‘void TextEditor::Highlighter::applyFormat(...) highlighter.cpp:572:22: error: ‘fontSettings’ was not declared in this scope Broken by 6ea686faa958e6b98fcdfdc48151552812156688. Fix by adapting the mock/fake header. Change-Id: I700a7ed4573c44f04ead5a2e6f2df198edaaebb4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.cpp5
-rw-r--r--tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.cpp b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.cpp
index 52beb4184c..4e4a9cfb47 100644
--- a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.cpp
+++ b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.cpp
@@ -26,6 +26,7 @@
#include "syntaxhighlighter.h"
#include "formats.h"
+#include <texteditor/fontsettings.h>
#include <texteditor/generichighlighter/highlighter.h>
using namespace TextEditor;
@@ -51,3 +52,7 @@ QTextCharFormat SyntaxHighlighter::formatForCategory(int categoryIndex) const
}
}
+FontSettings SyntaxHighlighter::fontSettings() const
+{
+ return FontSettings();
+}
diff --git a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h
index d8c2f64d7f..f9111d68c0 100644
--- a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h
+++ b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h
@@ -36,6 +36,8 @@
namespace TextEditor {
+class FontSettings;
+
class SyntaxHighlighter : public QSyntaxHighlighter
{
public:
@@ -48,7 +50,7 @@ protected:
void setTextFormatCategories(int, std::function<TextStyle(int)>)
{}
QTextCharFormat formatForCategory(int categoryIndex) const;
-
+ FontSettings fontSettings() const;
};
}