walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

GUI: Load user-selected library properly

This commit is contained in:
Daniel Marjamäki 2013-12-30 00:23:42 +01:00
parent bf8bb29938
commit ac91aa4fdf
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gui/mainwindow.cpp
View File

@ -532,9 +532,24 @@ Settings MainWindow::GetCppcheckSettings()
QStringList libraries = pfile->GetLibraries(); QStringList libraries = pfile->GetLibraries();
foreach(QString library, libraries) { foreach(QString library, libraries) {
const QString applicationFilePath = QCoreApplication::applicationFilePath(); const QString filename = library + ".cfg";
if (!result.library.load(applicationFilePath.toLatin1(), (library+".cfg").toLatin1()))
QMessageBox::information(this, tr("Information"), tr("Failed to load the selected library %1").arg(library)); // Try to load the library from the project folder..
QString path = QFileInfo(pfile->GetFilename()).canonicalPath();
if (result.library.load("", (path+"/"+filename).toLatin1()))
continue;
// Try to load the library from the application folder..
path = QFileInfo(QCoreApplication::applicationFilePath()).canonicalPath();
if (result.library.load("", (path+"/"+filename).toLatin1()))
continue;
// Try to load the library from the cfg subfolder..
path = path + "/cfg";
if (result.library.load("", (path+"/"+filename).toLatin1()))
continue;
QMessageBox::information(this, tr("Information"), tr("Failed to load the selected library %1").arg(filename));
} }
// Only check the given -D configuration // Only check the given -D configuration