From 5930ded264adbc3b9c0c635eed562e482e3bec62 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@theqtcompany.com>
Date: Thu, 12 Mar 2015 11:20:18 +0100
Subject: [PATCH] Compile fixes for MSVC2010

Change-Id: I9e72edad53eff88911d5ce4e9a26905a5393d411
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp | 2 +-
 src/plugins/qmakeprojectmanager/qmakeprojectimporter.h   | 3 ++-
 src/plugins/qmakeprojectmanager/qmakestep.h              | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
index 79d225bb00e..762323c4e14 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
@@ -107,7 +107,7 @@ QList<BuildInfo *> QmakeProjectImporter::import(const FileName &importPath, bool
 
         BaseQtVersion *version
                 = Utils::findOrDefault(QtVersionManager::versions(),
-                                      [&canonicalQmakeBinary](BaseQtVersion *v) {
+                                      [&canonicalQmakeBinary](BaseQtVersion *v) -> bool {
                                           QFileInfo vfi = v->qmakeCommand().toFileInfo();
                                           FileName current = FileName::fromString(vfi.canonicalFilePath());
                                           return current == canonicalQmakeBinary;
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.h b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.h
index 79c12ffde05..f0f006eb6ca 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.h
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.h
@@ -31,8 +31,9 @@
 #ifndef QMAKEPROJECTIMPORTER_H
 #define QMAKEPROJECTIMPORTER_H
 
+#include "qmakestep.h"
+
 #include <projectexplorer/projectimporter.h>
-#include <qmakestep.h>
 
 namespace QtSupport { class BaseQtVersion; }
 
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index ea1a9f9f474..85891a7fff9 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -36,6 +36,8 @@
 
 #include <QStringList>
 
+#include <tuple>
+
 namespace Utils { class FileName; }
 
 namespace ProjectExplorer {