Fix #12747 (GUI: when compliance report is generated the checkers-rep…

…ort should be provided.) (#6419)
danmar · May 22, 2024 · 8156978 · 8156978
1 parent ccfbc0c
commit 8156978
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/gui/compliancereportdialog.cpp b/gui/compliancereportdialog.cpp
@@ -86,11 +86,12 @@ static std::vector<std::string> toStdStringList(const QStringList& from) {
     return ret;
 }
 
-ComplianceReportDialog::ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile) :
-    QDialog(nullptr),
+ComplianceReportDialog::ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile, QString checkersReport)
+    : QDialog(nullptr),
     mUI(new Ui::ComplianceReportDialog),
     mProjectFile(projectFile),
-    mResultsFile(std::move(resultsFile))
+    mResultsFile(std::move(resultsFile)),
+    mCheckersReport(std::move(checkersReport))
 {
     mUI->setupUi(this);
     mUI->mEditProjectName->setText(projectFile->getProjectName());
@@ -146,6 +147,13 @@ void ComplianceReportDialog::save()
         mProjectFile->write();
     }
 
+    QTemporaryFile tempCheckersReport;
+    if (tempCheckersReport.open()) {
+        QTextStream out(&tempCheckersReport);
+        out << mCheckersReport << "\n";
+        tempCheckersReport.close();
+    }
+
     QTemporaryFile tempFiles;
     if (files && tempFiles.open()) {
         QTextStream out(&tempFiles);
@@ -205,7 +213,8 @@ void ComplianceReportDialog::save()
 
     QStringList args{"--project-name=" + projectName,
                      "--project-version=" + projectVersion,
-                     "--output-file=" + outFile};
+                     "--output-file=" + outFile,
+                     "--checkers-report=" + tempCheckersReport.fileName()};
     if (!suppressions.isEmpty())
         args << "--suppressions=" + suppressions.join(",");
 

diff --git a/gui/compliancereportdialog.h b/gui/compliancereportdialog.h
@@ -35,7 +35,7 @@ class ComplianceReportDialog final : public QDialog
     Q_OBJECT
 
 public:
-    explicit ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile);
+    explicit ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile, QString checkersReport);
     ~ComplianceReportDialog() final;
 
 private slots:
@@ -46,7 +46,8 @@ private slots:
 
     Ui::ComplianceReportDialog *mUI;
     ProjectFile* mProjectFile;
-    QString mResultsFile;
+    const QString mResultsFile;
+    const QString mCheckersReport;
 };
 
 #endif // COMPLIANCEREPORTDIALOG_H
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -22,6 +22,7 @@
 #include "applicationlist.h"
 #include "aboutdialog.h"
 #include "analyzerinfo.h"
+#include "checkstatistics.h"
 #include "checkthread.h"
 #include "common.h"
 #include "cppcheck.h"
@@ -1593,7 +1594,7 @@ void MainWindow::complianceReport()
 
     mUI->mResults->save(tempResults.fileName(), Report::XMLV2, mCppcheckCfgProductName);
 
-    ComplianceReportDialog dlg(mProjectFile, tempResults.fileName());
+    ComplianceReportDialog dlg(mProjectFile, tempResults.fileName(), mUI->mResults->getStatistics()->getCheckersReport());
     dlg.exec();
 }