More work at getting autotests compiling.

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)

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

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)
 {}