GUI: Fixed problem with absolute build dir

danmar · danmar · commit 09cdead6cb04 · 2017-10-08T15:01:03.000+02:00
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -847,8 +847,12 @@ Settings MainWindow::getCppcheckSettings()
 
         const QString &buildDir = mProjectFile->getBuildDir();
         if (!buildDir.isEmpty()) {
-            QString prjpath = QFileInfo(mProjectFile->getFilename()).absolutePath();
-            result.buildDir = (prjpath + '/' + buildDir).toStdString();
+            if (QDir(buildDir).isAbsolute()) {
+                result.buildDir = buildDir.toStdString();
+            } else {
+                QString prjpath = QFileInfo(mProjectFile->getFilename()).absolutePath();
+                result.buildDir = (prjpath + '/' + buildDir).toStdString();
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -847,8 +847,12 @@ Settings MainWindow::getCppcheckSettings()`
`847`	`847`
`848`	`848`	`const QString &buildDir = mProjectFile->getBuildDir();`
`849`	`849`	`if (!buildDir.isEmpty()) {`
`850`		`- QString prjpath = QFileInfo(mProjectFile->getFilename()).absolutePath();`
`851`		`- result.buildDir = (prjpath + '/' + buildDir).toStdString();`
	`850`	`+ if (QDir(buildDir).isAbsolute()) {`
	`851`	`+ result.buildDir = buildDir.toStdString();`
	`852`	`+ } else {`
	`853`	`+ QString prjpath = QFileInfo(mProjectFile->getFilename()).absolutePath();`
	`854`	`+ result.buildDir = (prjpath + '/' + buildDir).toStdString();`
	`855`	`+ }`
`852`	`856`	`}`
`853`	`857`	`}`
`854`	`858`