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

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Change-Id: I88a6704fb8d723a3cbdfb1a2d9c84741f30d4da6
This commit is contained in:
Eike Ziller
2019-07-22 09:34:47 +02:00
parent 370511b5e4 4c77521a6f
commit 4ce34fd90f
28 changed files with 304 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,10 +384,13 @@ void GenericProject::parseProject(RefreshOptions options)
}
}
QString GenericProject::findCommonSourceRoot(const QStringList &list)
FilePath GenericProject::findCommonSourceRoot()
{
QString root = list.front();
for (const QString &item : list) {
if (m_files.isEmpty())
return FilePath::fromFileInfo(QFileInfo(m_filesFileName).absolutePath());
QString root = m_files.front();
for (const QString &item : m_files) {
if (root.length() > item.length())
root.truncate(item.length());
@@ -398,7 +401,7 @@ QString GenericProject::findCommonSourceRoot(const QStringList &list)
}
}
}
return QFileInfo(root).absolutePath();
return FilePath::fromString(QFileInfo(root).absolutePath());
}
void GenericProject::refresh(RefreshOptions options)
@@ -410,7 +413,7 @@ void GenericProject::refresh(RefreshOptions options)
auto newRoot = std::make_unique<GenericProjectNode>(this);
// find the common base directory of all source files
Utils::FilePath baseDir = FilePath::fromFileInfo(QFileInfo(findCommonSourceRoot(m_files)));
Utils::FilePath baseDir = findCommonSourceRoot();
for (const QString &f : m_files) {
FileType fileType = FileType::Source; // ### FIXME