Merge remote-tracking branch 'origin/4.2'

Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
2016-11-14 11:15:40 +02:00
parent 1a2f649b70 b5f587efb5
commit 9c09ca9e42
175 changed files with 2145 additions and 1563 deletions
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -45,6 +45,7 @@ QtcPlugin {
        "clangbackendipcintegration.h",
        "clangcodemodelplugin.cpp",
        "clangcodemodelplugin.h",
+        "clangcodemodel.qrc",
        "clangcompletionassistinterface.cpp",
        "clangcompletionassistinterface.h",
        "clangcompletionassistprocessor.cpp",