From 0032af7fc67f7a55a90d63124274b589b7cb0698 Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Tue, 13 Jul 2010 11:40:42 +1000
Subject: [PATCH] More work at getting autotests compiling.
---
tests/auto/cplusplus/shared/shared.pro | 1 -
.../highlighterengine/highlighterengine.pro | 20 +++++++++++++++----
.../highlighterengine/highlightermock.cpp | 2 +-
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/tests/auto/cplusplus/shared/shared.pro b/tests/auto/cplusplus/shared/shared.pro
index 2bbbed55c25..1c7a7f9e9df 100644
--- a/tests/auto/cplusplus/shared/shared.pro
+++ b/tests/auto/cplusplus/shared/shared.pro
@@ -2,5 +2,4 @@ TEMPLATE = lib
TARGET = CPlusPlusTestSupport
CONFIG += static depend_includepath
QT = core gui
-DESTDIR = $$PWD
include($$PWD/../../../../src/libs/cplusplus/cplusplus-lib.pri)
diff --git a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
index c6ce8399a92..e8e65085daa 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
+++ b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
@@ -1,10 +1,13 @@
QT += gui testlib
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 \
@@ -13,15 +16,24 @@ SOURCES += tst_highlighterengine.cpp \
$$GENERICHIGHLIGHTERDIR/progressdata.cpp \
$$GENERICHIGHLIGHTERDIR/highlightdefinition.cpp \
$$GENERICHIGHLIGHTERDIR/keywordlist.cpp \
- $$GENERICHIGHLIGHTERDIR/itemdata.cpp \
- formats.cpp
+ $$GENERICHIGHLIGHTERDIR/itemdata.cpp
HEADERS += \
highlightermock.h \
basetextdocumentlayout.h \
formats.h \
- tabsettings.h
+ tabsettings.h \
+ $$TEXTEDITORDIR/syntaxhighlighter.h \
+ $$GENERICHIGHLIGHTERDIR/highlighter.h \
+ $$GENERICHIGHLIGHTERDIR/context.h \
+ $$GENERICHIGHLIGHTERDIR/dynamicrule.h \
+ $$GENERICHIGHLIGHTERDIR/rule.h \
+ $$GENERICHIGHLIGHTERDIR/specificrules.h \
+ $$GENERICHIGHLIGHTERDIR/progressdata.h \
+ $$GENERICHIGHLIGHTERDIR/highlightdefinition.h \
+ $$GENERICHIGHLIGHTERDIR/keywordlist.h \
+ $$GENERICHIGHLIGHTERDIR/itemdata.h
-INCLUDEPATH += $$GENERICHIGHLIGHTERDIR $$PLUGINSDIR
+INCLUDEPATH += $$GENERICHIGHLIGHTERDIR $$PLUGINSDIR $$TEXTEDITORDIR
TARGET=tst_$$TARGET
diff --git a/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp b/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp
index 7ed758a5a34..beeb7b58409 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp
+++ b/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp
@@ -49,9 +49,9 @@ using namespace Internal;
HighlighterMock::HighlighterMock(QTextDocument *parent) :
Highlighter(parent),
- m_debugDetails(false),
m_statesCounter(0),
m_formatsCounter(0),
+ m_debugDetails(false),
m_noTestCall(false),
m_considerEmptyLines(false)
{}
--
GitLab