From 5d11453c1dd680b90b8ba608103db8cda0bbd201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Tue, 9 Jun 2009 17:10:48 +0200 Subject: [PATCH] Fixed relative include paths specified for the generic project We forgot to convert them to absolute. Also removed two calls to removeDuplicates, since the convertToAbsoluteFiles already does that. Reviewed-by: Roberto Raggi --- src/plugins/genericprojectmanager/genericproject.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 35c24b6cdd9..238bd5f07d0 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -171,14 +171,11 @@ static QStringList readLines(const QString &absoluteFileName) void GenericProject::parseProject(RefreshOptions options) { - if (options & Files) { + if (options & Files) m_files = convertToAbsoluteFiles(readLines(filesFileName())); - m_files.removeDuplicates(); - } if (options & Configuration) { - m_projectIncludePaths = readLines(includesFileName()); - m_projectIncludePaths.removeDuplicates(); + m_projectIncludePaths = convertToAbsoluteFiles(readLines(includesFileName())); QSettings projectInfo(m_fileName, QSettings::IniFormat); m_generated = convertToAbsoluteFiles(projectInfo.value(QLatin1String("generated")).toStringList());