Merge remote-tracking branch 'origin/4.7'

Change-Id: I3c5d7e9e8c589ad4425cd89d61e1f572f5cb7997

src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp

@@ -106,11 +106,6 @@ void ClangDiagnosticConfigsSelectionWidget::refresh(Core::Id id)
     connectToCurrentIndexChanged();
 }
 
-void ClangDiagnosticConfigsSelectionWidget::showLabel(bool show)
-{
-    m_label->setVisible(show);
-}
-
 void ClangDiagnosticConfigsSelectionWidget::connectToClangDiagnosticConfigsDialog(QPushButton *button)
 {
     connect(button, &QPushButton::clicked, [this]() {

src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.h

@@ -50,8 +50,6 @@ public:
 
     void refresh(Core::Id id);
 
-    void showLabel(bool show);
-
 signals:
     void currentConfigChanged(const Core::Id &currentConfigId);
 

src/plugins/cpptools/cppsymbolinfo.h

@@ -39,7 +39,7 @@ public:
     int endLine = 0;
     int endColumn = 0;
     QString fileName;
-    bool isPureDeclarationForUsage = false;
+    bool isResultOnlyForFallBack = false;
 };
 
 } // namespace CppTools