Merge remote-tracking branch 'origin/4.7'

 Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I3d42bd52fb7b977cfdfad83092fb6f6eac974e24

1 files changed, 11 insertions, 3 deletions

diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index d2ae4e9f43..b017cb7e8f 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -168,7 +168,7 @@ static QList<QByteArray> fullIdForSymbol(CPlusPlus::Symbol *symbol)
 
 namespace {
 
-class ProcessFile: public std::unary_function<QString, QList<CPlusPlus::Usage> >
+class ProcessFile
 {
     const WorkingCopy workingCopy;
     const CPlusPlus::Snapshot snapshot;
@@ -177,6 +177,10 @@ class ProcessFile: public std::unary_function<QString, QList<CPlusPlus::Usage> >
     QFutureInterface<CPlusPlus::Usage> *future;
 
 public:
+    // needed by QtConcurrent
+    using argument_type = const Utils::FileName &;
+    using result_type = QList<CPlusPlus::Usage>;
+
     ProcessFile(const WorkingCopy &workingCopy,
                 const CPlusPlus::Snapshot snapshot,
                 CPlusPlus::Document::Ptr symbolDocument,
@@ -230,7 +234,7 @@ public:
     }
 };
 
-class UpdateUI: public std::binary_function<QList<CPlusPlus::Usage> &, QList<CPlusPlus::Usage>, void>
+class UpdateUI
 {
     QFutureInterface<CPlusPlus::Usage> *future;
 
@@ -596,7 +600,7 @@ static void searchFinished(SearchResult *search, QFutureWatcher<CPlusPlus::Usage
 
 namespace {
 
-class FindMacroUsesInFile: public std::unary_function<QString, QList<CPlusPlus::Usage> >
+class FindMacroUsesInFile
 {
     const WorkingCopy workingCopy;
     const CPlusPlus::Snapshot snapshot;
@@ -604,6 +608,10 @@ class FindMacroUsesInFile: public std::unary_function<QString, QList<CPlusPlus::
     QFutureInterface<CPlusPlus::Usage> *future;
 
 public:
+    // needed by QtConcurrent
+    using argument_type = const Utils::FileName &;
+    using result_type = QList<CPlusPlus::Usage>;
+
     FindMacroUsesInFile(const WorkingCopy &workingCopy,
                         const CPlusPlus::Snapshot snapshot,
                         const CPlusPlus::Macro &macro,