1 files changed, 9 insertions, 11 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index 541176d66a..6637e47ded 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -5,22 +5,16 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "CMakeProjectManager"
 
+    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
-    Depends { name: "ProjectExplorer" }
     Depends { name: "CppTools" }
     Depends { name: "CPlusPlus" }
-    Depends { name: "TextEditor" }
     Depends { name: "Locator" }
+    Depends { name: "ProjectExplorer" }
+    Depends { name: "TextEditor" }
     Depends { name: "QtSupport" }
-
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        ".",
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
+    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     files: [
         "CMakeProject.mimetypes.xml",
@@ -30,6 +24,8 @@ QtcPlugin {
         "cmakeeditor.h",
         "cmakeeditorfactory.cpp",
         "cmakeeditorfactory.h",
+        "cmakefilecompletionassist.cpp",
+        "cmakefilecompletionassist.h",
         "cmakehighlighter.cpp",
         "cmakehighlighter.h",
         "cmakelocatorfilter.cpp",
@@ -50,8 +46,10 @@ QtcPlugin {
         "cmakerunconfiguration.h",
         "cmakeuicodemodelsupport.cpp",
         "cmakeuicodemodelsupport.h",
+        "cmakevalidator.cpp",
+        "cmakevalidator.h",
         "makestep.cpp",
-        "makestep.h"
+        "makestep.h",
     ]
 }