1 files changed, 51 insertions, 110 deletions

diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index d0153d39793..e6d06a752bd 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -20,10 +20,6 @@ QtcPlugin {
         "QmakeProjectManager",
     ]
 
-    property bool clangCompletion: true
-    property bool clangHighlighting: true
-    property bool clangIndexing: false
-
     property string llvmConfig: Clang.llvmConfig(qbs, QtcFunctions, QtcProcessOutputReader)
     property string llvmIncludeDir: Clang.includeDir(llvmConfig, QtcProcessOutputReader)
     property string llvmLibDir: Clang.libDir(llvmConfig, QtcProcessOutputReader)
@@ -39,149 +35,94 @@ QtcPlugin {
 
     cpp.defines: {
         var defines = base;
+        // The following defines are used to determine the clang include path for intrinsics.
         defines.push('CLANG_VERSION="' + llvmVersion + '"');
         defines.push('CLANG_RESOURCE_DIR="' + llvmLibDir + '/clang/' + llvmVersion + '/include"');
-        if (clangCompletion)
-            defines.push("CLANG_COMPLETION");
-        if (clangHighlighting)
-            defines.push("CLANG_HIGHLIGHTING");
-        if (clangIndexing)
-            defines.push("CLANG_INDEXING");
         return defines;
     }
 
-    Group {
-        name: "Completion support"
-        condition: product.clangCompletion
-        files: [
-            "activationsequencecontextprocessor.cpp",
-            "activationsequencecontextprocessor.h",
-            "activationsequenceprocessor.cpp",
-            "activationsequenceprocessor.h",
-            "clangassistproposal.cpp",
-            "clangassistproposal.h",
-            "clangassistproposalitem.cpp",
-            "clangassistproposalitem.h",
-            "clangassistproposalmodel.cpp",
-            "clangassistproposalmodel.h",
-            "clangcompletionassistinterface.cpp",
-            "clangcompletionassistinterface.h",
-            "clangcompletionassistprocessor.cpp",
-            "clangcompletionassistprocessor.h",
-            "clangcompletionassistprovider.cpp",
-            "clangcompletionassistprovider.h",
-            "clangfunctionhintmodel.cpp",
-            "clangfunctionhintmodel.h",
-        ]
-    }
-
-    Group {
-        name: "Highlighting support"
-        condition: product.clangHighlighting
-        files: [
-            "cppcreatemarkers.cpp",
-            "cppcreatemarkers.h",
-            "highlightingmarksreporter.cpp",
-            "highlightingmarksreporter.h",
-        ]
-    }
-
-    Group {
-        name: "Indexing support"
-        condition: product.clangIndexing
-        files: [
-            "clangindexer.cpp",
-            "clangindexer.h",
-            "index.cpp",
-            "index.h",
-            "indexer.cpp",
-            "indexer.h",
-            // "dependencygraph.h",
-            // "dependencygraph.cpp"
-        ]
-    }
-
-    Group {
-        name: "Tests"
-        condition: project.testsEnabled
-        prefix: "test/"
-        files: [
-            "data/clangtestdata.qrc",
-            "clangcodecompletion_test.cpp",
-            "clangcodecompletion_test.h",
-        ]
-    }
-
-    Group {
-        name: "Test resources"
-        prefix: "test/data/"
-        fileTags: "none"
-        files: [ "*" ]
-        excludeFiles: "clangtestdata.qrc"
-    }
-
     files: [
-        "clang_global.h",
+        "activationsequencecontextprocessor.cpp",
+        "activationsequencecontextprocessor.h",
+        "activationsequenceprocessor.cpp",
+        "activationsequenceprocessor.h",
+        "clangassistproposal.cpp",
+        "clangassistproposal.h",
+        "clangassistproposalitem.cpp",
+        "clangassistproposalitem.h",
+        "clangassistproposalmodel.cpp",
+        "clangassistproposalmodel.h",
+        "clangbackendipcintegration.cpp",
+        "clangbackendipcintegration.h",
+        "clangcodemodelplugin.cpp",
+        "clangcodemodelplugin.h",
+        "clangcompletionassistinterface.cpp",
+        "clangcompletionassistinterface.h",
+        "clangcompletionassistprocessor.cpp",
+        "clangcompletionassistprocessor.h",
+        "clangcompletionassistprovider.cpp",
+        "clangcompletionassistprovider.h",
         "clangcompletioncontextanalyzer.cpp",
         "clangcompletioncontextanalyzer.h",
-        "clangeditordocumentparser.cpp",
-        "clangeditordocumentparser.h",
-        "clangeditordocumentprocessor.cpp",
-        "clangeditordocumentprocessor.h",
         "clangdiagnosticfilter.cpp",
         "clangdiagnosticfilter.h",
         "clangdiagnosticmanager.cpp",
         "clangdiagnosticmanager.h",
+        "clangeditordocumentparser.cpp",
+        "clangeditordocumentparser.h",
+        "clangeditordocumentprocessor.cpp",
+        "clangeditordocumentprocessor.h",
         "clangfixitoperation.cpp",
         "clangfixitoperation.h",
         "clangfixitoperationsextractor.cpp",
         "clangfixitoperationsextractor.h",
+        "clangfunctionhintmodel.cpp",
+        "clangfunctionhintmodel.h",
+        "clang_global.h",
         "clangmodelmanagersupport.cpp",
         "clangmodelmanagersupport.h",
-        "clangcodemodelplugin.cpp",
-        "clangcodemodelplugin.h",
         "clangprojectsettings.cpp",
         "clangprojectsettings.h",
         "clangprojectsettingspropertiespage.cpp",
         "clangprojectsettingspropertiespage.h",
         "clangprojectsettingspropertiespage.ui",
-        "clangsymbol.cpp",
-        "clangsymbol.h",
         "clangtextmark.cpp",
         "clangtextmark.h",
         "clangutils.cpp",
         "clangutils.h",
-        "clangbackendipcintegration.cpp",
-        "clangbackendipcintegration.h",
         "completionchunkstotextconverter.cpp",
         "completionchunkstotextconverter.h",
         "constants.h",
-        "cxprettyprinter.cpp",
-        "cxprettyprinter.h",
-        "cxraii.h",
-        "diagnostic.cpp",
-        "diagnostic.h",
-        "fastindexer.cpp",
-        "fastindexer.h",
+        "highlightingmarksreporter.cpp",
+        "highlightingmarksreporter.h",
         "pchinfo.cpp",
         "pchinfo.h",
         "pchmanager.cpp",
         "pchmanager.h",
-        "semanticmarker.cpp",
-        "semanticmarker.h",
-        "sourcelocation.cpp",
-        "sourcelocation.h",
-        "sourcemarker.cpp",
-        "sourcemarker.h",
+        "raii/scopedclangoptions.cpp",
+        "raii/scopedclangoptions.h",
         "unit.cpp",
         "unit.h",
         "unsavedfiledata.cpp",
         "unsavedfiledata.h",
-        "utils.cpp",
-        "utils.h",
-        "utils_p.cpp",
-        "utils_p.h",
-        "raii/scopedclangoptions.cpp",
-        "raii/scopedclangoptions.h",
     ]
+
+    Group {
+        name: "Tests"
+        condition: project.testsEnabled
+        prefix: "test/"
+        files: [
+            "data/clangtestdata.qrc",
+            "clangcodecompletion_test.cpp",
+            "clangcodecompletion_test.h",
+        ]
+    }
+
+    Group {
+        name: "Test resources"
+        prefix: "test/data/"
+        fileTags: "none"
+        files: [ "*" ]
+        excludeFiles: "clangtestdata.qrc"
+    }
 }