feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/qds/dev'

Browse Source 
Change-Id: I6c657f5b8c0602ca76e9b17b10f1ff7a38b1b8be
This commit is contained in:
Tim Jenssen
2023-12-14 19:32:20 +01:00
parent 64f0e10a4e dc42b62ddf
commit 06bfa66ed7
151 changed files with 3628 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -9,6 +9,7 @@
#include "cmaketoolmanager.h"
#include <coreplugin/dialogs/ioptionspage.h>
#include <coreplugin/icore.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/detailswidget.h>
@@ -457,6 +458,9 @@ void CMakeToolItemConfigWidget::onBinaryPathEditingFinished()
void CMakeToolItemConfigWidget::updateQchFilePath()
{
// QDS does not want automatic detection of cmake help file
if (Core::ICore::isQtDesignStudio())
return;
if (m_qchFileChooser->filePath().isEmpty())
m_qchFileChooser->setFilePath(CMakeTool::searchQchFile(m_binaryChooser->filePath()));
}