summaryrefslogtreecommitdiff
path: root/src/plugins/clangcodemodel
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2017-02-28 12:01:31 +0100
committerChristian Stenger <christian.stenger@qt.io>2017-02-28 11:30:37 +0000
commita2b47b7da274580c40df2fb474d4b65a6865a1df (patch)
tree6b728c2cdd1229289c70400bf4c4b7181d0f0f29 /src/plugins/clangcodemodel
parenta144160c44ed43f75e323d50f993a7e25d33658e (diff)
downloadqt-creator-a2b47b7da274580c40df2fb474d4b65a6865a1df.tar.gz
ClangCodeModel: Fix compile
Change-Id: I648ebd8d898cab3bb121eabf96f2de3d4b28842c Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/clangcodemodel')
-rw-r--r--src/plugins/clangcodemodel/clangcodemodelplugin.cpp2
-rw-r--r--src/plugins/clangcodemodel/test/clangautomationutils.cpp (renamed from src/plugins/clangcodemodel/clangautomationutils.cpp)4
-rw-r--r--src/plugins/clangcodemodel/test/clangautomationutils.h (renamed from src/plugins/clangcodemodel/clangautomationutils.h)0
-rw-r--r--src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp (renamed from src/plugins/clangcodemodel/clangbatchfileprocessor.cpp)0
-rw-r--r--src/plugins/clangcodemodel/test/clangbatchfileprocessor.h (renamed from src/plugins/clangcodemodel/clangbatchfileprocessor.h)0
-rw-r--r--src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp2
6 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index 729d26ec7c..7f18d386c4 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -25,11 +25,11 @@
#include "clangcodemodelplugin.h"
-#include "clangbatchfileprocessor.h"
#include "clangconstants.h"
#include "clangprojectsettingswidget.h"
#ifdef WITH_TESTS
+# include "test/clangbatchfileprocessor.h"
# include "test/clangcodecompletion_test.h"
#endif
diff --git a/src/plugins/clangcodemodel/clangautomationutils.cpp b/src/plugins/clangcodemodel/test/clangautomationutils.cpp
index 29dc1c7155..e0bc59e2f3 100644
--- a/src/plugins/clangcodemodel/clangautomationutils.cpp
+++ b/src/plugins/clangcodemodel/test/clangautomationutils.cpp
@@ -25,8 +25,8 @@
#include "clangautomationutils.h"
-#include "clangcompletionassistinterface.h"
-#include "clangcompletionassistprovider.h"
+#include "../clangcompletionassistinterface.h"
+#include "../clangcompletionassistprovider.h"
#include <texteditor/codeassist/assistinterface.h>
#include <texteditor/codeassist/assistproposalitem.h>
diff --git a/src/plugins/clangcodemodel/clangautomationutils.h b/src/plugins/clangcodemodel/test/clangautomationutils.h
index 9942a597fd..9942a597fd 100644
--- a/src/plugins/clangcodemodel/clangautomationutils.h
+++ b/src/plugins/clangcodemodel/test/clangautomationutils.h
diff --git a/src/plugins/clangcodemodel/clangbatchfileprocessor.cpp b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
index 26399fe771..26399fe771 100644
--- a/src/plugins/clangcodemodel/clangbatchfileprocessor.cpp
+++ b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
diff --git a/src/plugins/clangcodemodel/clangbatchfileprocessor.h b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h
index 40f0bceee3..40f0bceee3 100644
--- a/src/plugins/clangcodemodel/clangbatchfileprocessor.h
+++ b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h
diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
index f5072068f6..9d2008662f 100644
--- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
+++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
@@ -25,7 +25,7 @@
#include "clangcodecompletion_test.h"
-#include "../clangautomationutils.h"
+#include "clangautomationutils.h"
#include "../clangbackendipcintegration.h"
#include "../clangcompletionassistinterface.h"
#include "../clangmodelmanagersupport.h"