forked from qt-creator/qt-creator
CMakePM: Fix crash when switching CMake tools and clicking help links
The crash scenario: 1. Switch CMake tool in Kit CMake Configuration in Settings 2. Click on the "options" help link Change-Id: Ifdb2809789748926a5ee0e127db0c87a22efa9dc Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -492,16 +492,22 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
|
||||
updateInitialCMakeArguments();
|
||||
});
|
||||
|
||||
auto handleOptionsLink = [this](const QString &link) {
|
||||
const CMakeTool *tool = CMakeKitAspect::cmakeTool(m_buildConfiguration->target()->kit());
|
||||
CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake.1.html#options");
|
||||
};
|
||||
connect(bc->aspect<InitialCMakeArgumentsAspect>(),
|
||||
&Utils::BaseAspect::labelLinkActivated,
|
||||
[=](const QString &link) { handleOptionsLink(link); });
|
||||
this,
|
||||
[this](const QString &link) {
|
||||
const CMakeTool *tool = CMakeKitAspect::cmakeTool(
|
||||
m_buildConfiguration->target()->kit());
|
||||
CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake.1.html#options");
|
||||
});
|
||||
connect(bc->aspect<AdditionalCMakeOptionsAspect>(),
|
||||
&Utils::BaseAspect::labelLinkActivated,
|
||||
[=](const QString &link) { handleOptionsLink(link); });
|
||||
this,
|
||||
[this](const QString &link) {
|
||||
const CMakeTool *tool = CMakeKitAspect::cmakeTool(
|
||||
m_buildConfiguration->target()->kit());
|
||||
CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake.1.html#options");
|
||||
});
|
||||
|
||||
updateSelection();
|
||||
updateConfigurationStateSelection();
|
||||
|
Reference in New Issue
Block a user