From 1b231d1dc69a908a9556073d8bf09212046a9f9b Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 24 Oct 2018 15:15:51 +0200
Subject: [PATCH] Tests: Fix linking without lib tooling

Change-Id: I51110089b1bed337de54dfa7167b2a5aff761837
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 .../source/clangpchmanagerbackend-source.pri       | 14 +++++++-------
 tests/unit/unittest/unittest.pro                   |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri b/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri
index 1e1dde72ecd..f0104c00eab 100644
--- a/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri
+++ b/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri
@@ -3,8 +3,7 @@ INCLUDEPATH += $$PWD
 SOURCES += \
     $$PWD/pchmanagerserver.cpp \
     $$PWD/projectparts.cpp \
-    $$PWD/projectpartqueue.cpp \
-    $$PWD/usedmacrosandsourcescollector.cpp
+    $$PWD/projectpartqueue.cpp
 
 HEADERS += \
     $$PWD/pchmanagerserver.h \
@@ -23,15 +22,12 @@ HEADERS += \
     $$PWD/taskschedulerinterface.h \
     $$PWD/precompiledheaderstorage.h \
     $$PWD/precompiledheaderstorageinterface.h \
-    $$PWD/collectusedmacroactionfactory.h \
-    $$PWD/collectusedmacrosaction.h \
-    $$PWD/collectusedmacrosandsourcespreprocessorcallbacks.h \
-    $$PWD/usedmacrosandsourcescollector.h \
     $$PWD/usedmacroandsourcestorageinterface.h \
     $$PWD/usedmacroandsourcestorage.h
 
 !isEmpty(LIBTOOLING_LIBS) {
 SOURCES += \
+    $$PWD/usedmacrosandsourcescollector.cpp \
     $$PWD/includecollector.cpp \
     $$PWD/pchcreator.cpp
 
@@ -40,6 +36,10 @@ HEADERS += \
     $$PWD/collectincludestoolaction.h \
     $$PWD/collectincludesaction.h \
     $$PWD/collectincludespreprocessorcallbacks.h \
+    $$PWD/collectusedmacroactionfactory.h \
+    $$PWD/collectusedmacrosaction.h \
+    $$PWD/collectusedmacrosandsourcespreprocessorcallbacks.h \
     $$PWD/pchcreator.h \
-    $$PWD/processormanager.h
+    $$PWD/processormanager.h \
+    $$PWD/usedmacrosandsourcescollector.h
 }
diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro
index 41d9d890d9b..da56757a141 100644
--- a/tests/unit/unittest/unittest.pro
+++ b/tests/unit/unittest/unittest.pro
@@ -102,8 +102,7 @@ SOURCES += \
     projectpartqueue-test.cpp \
     processormanager-test.cpp \
     taskscheduler-test.cpp \
-    compileroptionsbuilder-test.cpp \
-    usedmacrocollector-test.cpp
+    compileroptionsbuilder-test.cpp
 
 !isEmpty(LIBCLANG_LIBS) {
 SOURCES += \
@@ -180,7 +179,8 @@ SOURCES += \
     symbolindexing-test.cpp \
     symbolscollector-test.cpp \
     symbolfinder-test.cpp \
-    testclangtool.cpp
+    testclangtool.cpp \
+    usedmacrocollector-test.cpp
 }
 
 exists($$GOOGLEBENCHMARK_DIR) {