feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Compile fixes for MSVC2010

Browse Source 
Change-Id: I9e72edad53eff88911d5ce4e9a26905a5393d411
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Robert Loehning
2015-03-12 11:20:18 +01:00
parent 0d10ecd668
commit 5930ded264
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
View File

@@ -107,7 +107,7 @@ QList<BuildInfo *> QmakeProjectImporter::import(const FileName &importPath, bool
BaseQtVersion *version BaseQtVersion *version
= Utils::findOrDefault(QtVersionManager::versions(), = Utils::findOrDefault(QtVersionManager::versions(),
[&canonicalQmakeBinary](BaseQtVersion *v) { [&canonicalQmakeBinary](BaseQtVersion *v) -> bool {
QFileInfo vfi = v->qmakeCommand().toFileInfo(); QFileInfo vfi = v->qmakeCommand().toFileInfo();
FileName current = FileName::fromString(vfi.canonicalFilePath()); FileName current = FileName::fromString(vfi.canonicalFilePath());
return current == canonicalQmakeBinary; return current == canonicalQmakeBinary;

3
src/plugins/qmakeprojectmanager/qmakeprojectimporter.h
View File

@@ -31,8 +31,9 @@
#ifndef QMAKEPROJECTIMPORTER_H #ifndef QMAKEPROJECTIMPORTER_H
#define QMAKEPROJECTIMPORTER_H #define QMAKEPROJECTIMPORTER_H
#include "qmakestep.h"
#include <projectexplorer/projectimporter.h> #include <projectexplorer/projectimporter.h>
#include <qmakestep.h>
namespace QtSupport { class BaseQtVersion; } namespace QtSupport { class BaseQtVersion; }

2
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -36,6 +36,8 @@
#include <QStringList> #include <QStringList>
#include <tuple>
namespace Utils { class FileName; } namespace Utils { class FileName; }
namespace ProjectExplorer { namespace ProjectExplorer {