fix

Author: ludviggunne

gui/mainwindow.cpp

@@ -1122,7 +1122,7 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
         for (const QString& undefine : undefines)
             settings.userUndefs.insert(undefine.toStdString());
 
-        settings.userIncludes.push_back(mProjectFile->getUserInclude().toStdString());
+        mProjectFile->setSettingsUserIncludes(settings);
 
         const QStringList libraries = mProjectFile->getLibraries();
         for (const QString& library : libraries) {

gui/projectfile.cpp

@@ -1078,6 +1078,12 @@ void ProjectFile::writeStringList(QXmlStreamWriter &xmlWriter, const QStringList
     xmlWriter.writeEndElement();
 }
 
+void ProjectFile::setSettingsUserIncludes(Settings &settings) const
+{
+    if (!mUserInclude.trimmed().isEmpty())
+        settings.userIncludes.push_back(mUserInclude.toStdString());
+}
+
 QStringList ProjectFile::fromNativeSeparators(const QStringList &paths)
 {
     QStringList ret;

gui/projectfile.h

@@ -452,8 +452,13 @@ class ProjectFile : public QObject {
 
     /** Get paths where we should glob for certain files (dir="cfg"/"platforms"/etc */
     QStringList getSearchPaths(const QString& dir) const;
+
     static QStringList getSearchPaths(const QString& projectPath, const QString& appPath, const QString& datadir, const QString& dir);
 
+    /** Set user includes in settings if non-empty */
+    void setSettingsUserIncludes(Settings &settings) const;
+
+
 protected:
 
     /**