Merge remote-tracking branch 'origin/4.2'

Change-Id: I259a402bc896fc2e359cc96b7510453ac9a9a552
2016-11-28 15:27:51 +02:00
parent f69a466534 96256d1ecc
commit 7b3642cce4
128 changed files with 3030 additions and 1713 deletions
--- a/src/plugins/clangcodemodel/clangcodemodel.pro
+++ b/src/plugins/clangcodemodel/clangcodemodel.pro
@@ -30,6 +30,7 @@ SOURCES += \
    clangprojectsettings.cpp \
    clangprojectsettingswidget.cpp \
    clangtextmark.cpp \
+    clanguiheaderondiskmanager.cpp \
    clangutils.cpp

 HEADERS += \
@@ -61,6 +62,7 @@ HEADERS += \
    clangprojectsettings.h \
    clangprojectsettingswidget.h \
    clangtextmark.h \
+    clanguiheaderondiskmanager.h \
    clangutils.h

 FORMS += clangprojectsettingswidget.ui