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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
This commit is contained in:
Eike Ziller
2012-12-14 08:20:49 +01:00
parent fe6be533bc 6d83dda6df
commit a8a33b9a3b
39 changed files with 494 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -330,6 +330,8 @@ QStringList GenericProject::processEntries(const QStringList &paths,
expandEnvironmentVariables(env, trimmedPath);
trimmedPath = Utils::FileName::fromUserInput(trimmedPath).toString();
const QString absPath = QFileInfo(projectDir, trimmedPath).absoluteFilePath();
absolutePaths.append(absPath);
if (map)