Fix creator compiling

Change-Id: Ia2d5c58230fa9076af4df9268399ccf6ad43eba2
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>

8 files changed, 13 insertions, 7 deletions

diff --git a/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri b/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri
index 295fcc7e35..3b6cea6cc0 100644
--- a/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri
+++ b/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri
@@ -1,2 +1,3 @@
 QTC_LIB_NAME = Codemodelbackendipc
+QTC_LIB_DEPENDS += sqlite
 INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc/source
diff --git a/src/libs/codemodelbackendipc/source/codecompletion.cpp b/src/libs/codemodelbackendipc/source/codecompletion.cpp
index 5eab93b4e3..3c004b1a0f 100644
--- a/src/libs/codemodelbackendipc/source/codecompletion.cpp
+++ b/src/libs/codemodelbackendipc/source/codecompletion.cpp
@@ -167,7 +167,7 @@ void PrintTo(const CodeCompletion &command, ::std::ostream* os)
     *os << ")";
 }
 
-void PrintTo(const CodeCompletion::Kind &kind, std::ostream *os)
+void PrintTo(const CodeCompletion::Kind &kind, ::std::ostream *os)
 {
     switch (kind) {
         case CodeCompletion::Other: *os << "Other"; break;
diff --git a/src/libs/codemodelbackendipc/source/codecompletion.h b/src/libs/codemodelbackendipc/source/codecompletion.h
index 6927013757..f0a55a981a 100644
--- a/src/libs/codemodelbackendipc/source/codecompletion.h
+++ b/src/libs/codemodelbackendipc/source/codecompletion.h
@@ -121,7 +121,7 @@ bool operator < (const CodeCompletion &first, const CodeCompletion &second);
 
 QDebug operator <<(QDebug debug, const CodeCompletion &command);
 void PrintTo(const CodeCompletion &command, ::std::ostream* os);
-void PrintTo(const CodeCompletion::Kind &kind, std::ostream *os);
+void PrintTo(const CodeCompletion::Kind &kind, ::std::ostream *os);
 } // namespace CodeModelBackEnd
 
 Q_DECLARE_METATYPE(CodeModelBackEnd::CodeCompletion)
diff --git a/src/tools/codemodelbackend/codemodelbackend.pri b/src/tools/codemodelbackend/codemodelbackend.pri
index a15d9f45a9..19b0e159a4 100644
--- a/src/tools/codemodelbackend/codemodelbackend.pri
+++ b/src/tools/codemodelbackend/codemodelbackend.pri
@@ -16,8 +16,11 @@ TEMPLATE = app
 
 include(ipcsource/codemodelbackendclangipc-source.pri)
 include(../../../qtcreator.pri)
+include(clang_installation.pri)
 
 LIBS += -L$$OUT_PWD/../codemodelbackendipc/lib/qtcreator -lCodemodelbackendipc -lSqlite
+LIBS += $$LLVM_LIBS
+INCLUDEPATH += $$LLVM_INCLUDEPATH
 
 INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc/source
 INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/sqlite/source
diff --git a/src/tools/codemodelbackend/ipcsource/codecompleter.cpp b/src/tools/codemodelbackend/ipcsource/codecompleter.cpp
index de4d703d92..a0cbd49a15 100644
--- a/src/tools/codemodelbackend/ipcsource/codecompleter.cpp
+++ b/src/tools/codemodelbackend/ipcsource/codecompleter.cpp
@@ -43,8 +43,6 @@
 
 #include <QDebug>
 
-#include <qtcassert.h>
-
 namespace CodeModelBackEnd {
 
 QString toString(CXCompletionChunkKind kind)
diff --git a/src/tools/codemodelbackend/ipcsource/codecompletionsextracter.cpp b/src/tools/codemodelbackend/ipcsource/codecompletionsextracter.cpp
index 055e4ab32d..e331f26082 100644
--- a/src/tools/codemodelbackend/ipcsource/codecompletionsextracter.cpp
+++ b/src/tools/codemodelbackend/ipcsource/codecompletionsextracter.cpp
@@ -32,7 +32,9 @@
 
 #include "clangstring.h"
 
+#ifdef CODEMODELBACKEND_TESTS
 #include <gtest/gtest.h>
+#endif
 
 #include <QDebug>
 
@@ -216,12 +218,13 @@ const CodeCompletion CodeCompletionsExtracter::currentCodeCompletion() const
     return currentCodeCompletion_;
 }
 
+#ifdef CODEMODELBACKEND_TESTS
 void PrintTo(const CodeCompletionsExtracter &extracter, std::ostream *os)
 {
     *os << "name: " << ::testing::PrintToString(extracter.currentCodeCompletion().text())
         << ", kind: " <<  ::testing::PrintToString(extracter.currentCodeCompletion().completionKind());
 }
-
+#endif
 
 } // namespace CodeModelBackEnd
 
diff --git a/src/tools/codemodelbackend/ipcsource/codecompletionsextracter.h b/src/tools/codemodelbackend/ipcsource/codecompletionsextracter.h
index bb3b98aded..9d189a6e46 100644
--- a/src/tools/codemodelbackend/ipcsource/codecompletionsextracter.h
+++ b/src/tools/codemodelbackend/ipcsource/codecompletionsextracter.h
@@ -68,8 +68,9 @@ private:
     mutable uint cxCodeCompleteResultIndex = -1;
 };
 
-
+#ifdef CODEMODELBACKEND_TESTS
 void PrintTo(const CodeCompletionsExtracter &extracter, ::std::ostream* os);
+#endif
 } // namespace CodeModelBackEnd
 
 #endif // CODEMODELBACKEND_CODECOMPLETIONSEXTRACTER_H
diff --git a/tests/unit/codemodelbackend/unittest/unittest.pro b/tests/unit/codemodelbackend/unittest/unittest.pro
index 706b96fe8f..cb8e7de6bb 100644
--- a/tests/unit/codemodelbackend/unittest/unittest.pro
+++ b/tests/unit/codemodelbackend/unittest/unittest.pro
@@ -69,7 +69,7 @@ OTHER_FILES += data/complete_testfile_1.cpp \
                data/complete_extracter_constructor.cpp
 
 DEFINES += QT_NO_CAST_FROM_ASCII
-DEFINES += CODEMODELBACKENDIPC_TESTS
+DEFINES += CODEMODELBACKEND_TESTS
 DEFINES += DONT_CHECK_COMMAND_COUNTER
 DEFINES += GTEST_HAS_STD_INITIALIZER_LIST_