ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Fixed path checking in project setup wizzard

Browse Source
This commit is contained in:
Eberhard Graether
2016-04-21 16:11:00 +02:00
parent b5bcabb494
commit 526f966356
7 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp
+16 -16
View File
@@ -97,24 +97,25 @@ bool QtProjectWizzardContentPaths::check()
QString missingPaths;
for (FilePath f : m_list->getList())
{
f = f.expandEnvironmentVariables();
if (!f.exists())
FilePath fi = f.expandEnvironmentVariables();
if (!fi.isAbsolute())
{
if (!missingPaths.isEmpty())
{
missingPaths.append("\n");
}
fi = FilePath(m_settings->getProjectFileLocation()).concat(fi);
}
if (!fi.exists())
{
missingPaths.append("\n");
missingPaths.append(f.str().c_str());
}
}
if (!missingPaths.isEmpty())
{
QMessageBox msgBox;
msgBox.setText("These paths do not exist:\n" + missingPaths);
msgBox.exec();
return false;
}
if (!missingPaths.isEmpty())
{
QMessageBox msgBox;
msgBox.setText("These paths do not exist:" + missingPaths);
msgBox.exec();
return false;
}
return true;
@@ -267,8 +268,7 @@ QStringList QtProjectWizzardContentPathsSource::getSourceFileNames(bool headersO
utility::append(extensions, m_settings->getHeaderExtensions());
std::vector<FileInfo> fileInfos = FileSystem::getFileInfosFromPaths(sourcePaths, extensions);
FilePath projectPath = FilePath(m_settings->getProjectFileLocation());
FilePath projectPath = m_settings->getProjectFileLocation();
QStringList list;
for (const FileInfo& info : fileInfos)