Merge remote-tracking branch 'origin/4.14'

Change-Id: I2ae0eb18782224e48cd20d41907f9dfea6ee1771

src/plugins/cpptools/cppfindreferences.cpp

@@ -555,6 +555,7 @@ static void displayResults(SearchResult *search, QFutureWatcher<CPlusPlus::Usage
         switch (type) {
         case CPlusPlus::Usage::Type::Read:
             return SearchResultColor::Style::Alt1;
+        case CPlusPlus::Usage::Type::Initialization:
         case CPlusPlus::Usage::Type::Write:
         case CPlusPlus::Usage::Type::WritableRef:
             return SearchResultColor::Style::Alt2;

src/plugins/cpptools/cpplocatordata.cpp

@@ -32,7 +32,6 @@ using namespace CppTools::Internal;
 enum { MaxPendingDocuments = 10 };
 
 CppLocatorData::CppLocatorData()
-    : m_pendingDocumentsMutex(QMutex::Recursive)
 {
     m_search.setSymbolsToSearchFor(SymbolSearcher::Enums |
                                    SymbolSearcher::Classes |

src/plugins/cpptools/cpplocatordata.h

@@ -66,7 +66,7 @@ private:
     mutable SearchSymbols m_search;
     mutable QHash<QString, IndexItem::Ptr> m_infosByFile;
 
-    mutable QMutex m_pendingDocumentsMutex;
+    mutable QRecursiveMutex m_pendingDocumentsMutex;
     mutable QVector<CPlusPlus::Document::Ptr> m_pendingDocuments;
 };
 

src/plugins/cpptools/cppprojectupdater.cpp

@@ -101,7 +101,6 @@ void CppProjectUpdater::onProjectInfoGenerated()
 
     QFuture<void> future = CppModelManager::instance()
             ->updateProjectInfo(m_futureInterface, m_generateFutureWatcher.result());
-    QTC_CHECK(future != QFuture<void>());
 }
 
 CppProjectUpdaterFactory::CppProjectUpdaterFactory()

src/plugins/cpptools/cppprojectupdater.h

@@ -47,7 +47,7 @@ public:
     Q_INVOKABLE CppTools::CppProjectUpdaterInterface *create();
 };
 
-class CPPTOOLS_EXPORT CppProjectUpdater : public QObject, public CppProjectUpdaterInterface
+class CPPTOOLS_EXPORT CppProjectUpdater final : public QObject, public CppProjectUpdaterInterface
 {
     Q_OBJECT
 

src/plugins/cpptools/symbolfinder.h

@@ -30,6 +30,7 @@
 #include "cppfileiterationorder.h"
 
 #include <QHash>
+#include <QSet>
 #include <QStringList>
 
 #include <set>

src/plugins/cpptools/symbolsfindfilter.h

@@ -28,6 +28,8 @@
 #include "searchsymbols.h"
 
 #include <coreplugin/find/ifindfilter.h>
+#include <coreplugin/find/searchresultitem.h>
+#include <coreplugin/find/searchresultwindow.h>
 
 #include <QFutureWatcher>
 #include <QPointer>