Skip to content

Fix #14829 (Platform configuration mismatch between UI selection and analysis log) #8833

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

Open
danmar wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −5
Open

Fix #14829 (Platform configuration mismatch between UI selection and analysis log) #8833

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions gui/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLib, const bo
});
p.ignorePaths(v);

if (!mProjectFile->getAnalyzeAllVsConfigs()) {
if (checkSettings.platform.type == Platform::Native && !mProjectFile->getAnalyzeAllVsConfigs()) {
const Platform::Type platform = static_cast<Platform::Type>(mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt());
std::vector<std::string> configurations;
const QStringList configs = mProjectFile->getVsConfigurations();
Expand Down Expand Up @@ -1155,10 +1155,9 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)

const QString platform = mProjectFile->getPlatform();
if (platform.endsWith(".xml")) {
const std::vector<std::string> paths = {
Path::getCurrentPath(), // TODO: do we want to look in CWD?
QCoreApplication::applicationFilePath().toStdString(),
};
std::vector<std::string> paths;
for (const QString& p: mProjectFile->getSearchPaths("platform"))
paths.emplace_back(p.toStdString());
settings.platform.loadFromFile(paths, platform.toStdString());
} else {
for (int i = Platform::Type::Native; i <= Platform::Type::Unix64; i++) {
Expand Down
Loading