Skip to content

Fix #14680: GUI: internalError with empty user includes #8478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ludviggunne merged 4 commits into from
Apr 23, 2026
Merged

Fix #14680: GUI: internalError with empty user includes #8478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
142d192
fix
ludviggunne Apr 22, 2026
3e90dc9
add test
ludviggunne Apr 22, 2026
2f2e32c
trim userInclude in setter
ludviggunne Apr 22, 2026
3c4e0b3
test with non-empty string
ludviggunne Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gui/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 6 additions & 0 deletions gui/projectfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,12 @@ void ProjectFile::writeStringList(QXmlStreamWriter &xmlWriter, const QStringList
xmlWriter.writeEndElement();
}

void ProjectFile::setSettingsUserIncludes(Settings &settings) const
{
if (!mUserInclude.isEmpty())
settings.userIncludes.push_back(mUserInclude.toStdString());
Comment thread
ludviggunne marked this conversation as resolved.
}

QStringList ProjectFile::fromNativeSeparators(const QStringList &paths)
{
QStringList ret;
Expand Down
7 changes: 6 additions & 1 deletion gui/projectfile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class ProjectFile : public QObject {
}

void setUserInclude(const QString& userInclude) {
mUserInclude = userInclude;
mUserInclude = userInclude.trimmed();
}

/**
Expand Down Expand Up @@ -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:

/**
Expand Down
9 changes: 9 additions & 0 deletions gui/test/projectfile/testprojectfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,5 +199,14 @@ void TestProjectFile::getCheckingSuppressionsStar() const
QCOMPARE(projectFile.getCheckingSuppressions()[0].fileName, "*.cpp");
}

void TestProjectFile::emptyUserInclude() const
{
ProjectFile projectFile;
Settings settings;
projectFile.setUserInclude(" ");
projectFile.setSettingsUserIncludes(settings);
QCOMPARE(settings.userIncludes.size(), 0);
}

QTEST_MAIN(TestProjectFile)

2 changes: 2 additions & 0 deletions gui/test/projectfile/testprojectfile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ private slots:
void getCheckingSuppressionsRelative() const;
void getCheckingSuppressionsAbsolute() const;
void getCheckingSuppressionsStar() const;

void emptyUserInclude() const;
};
Loading