aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2022-08-10 09:58:22 +0200
committerDavid Schulz <david.schulz@qt.io>2022-08-10 10:12:38 +0000
commit5db3d507ddf4b1582fc32828d9a6b67a3a1309bd (patch)
treea5e69e968cbb6da895f3f8d9427723b4090fe4ee
parent52b8b51b32a63844004a9073a2d5161dd0e96dac (diff)
Revert "CMake: Reload item data on CMake executable path changed"
057bb3095 makes it impossible to type in dir separators and so a valid path to a cmake executable in the Path field of the cmake settings page. This reverts commit 057bb3095b11e88cf509cea5845a6e4fabad90d8. Change-Id: I3edbdced8eaac15f34ca43acf1e86f4be6cd9be7 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
-rw-r--r--src/plugins/cmakeprojectmanager/cmakesettingspage.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
index 826af0c7b67..09a6bfbf2e9 100644
--- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
@@ -433,7 +433,6 @@ public:
private:
void updateQchFilePath();
- void reload();
CMakeToolItemModel *m_model;
QLineEdit *m_displayNameLineEdit;
@@ -479,8 +478,8 @@ CMakeToolItemConfigWidget::CMakeToolItemConfigWidget(CMakeToolItemModel *model)
connect(m_binaryChooser, &PathChooser::rawPathChanged, this, [this]() {
updateQchFilePath();
+ m_qchFileChooser->setBaseDirectory(m_binaryChooser->filePath().parentDir());
store();
- reload();
});
connect(m_qchFileChooser, &PathChooser::rawPathChanged, this, &CMakeToolItemConfigWidget::store);
connect(m_displayNameLineEdit, &QLineEdit::textChanged, this, &CMakeToolItemConfigWidget::store);
@@ -504,18 +503,6 @@ void CMakeToolItemConfigWidget::updateQchFilePath()
m_qchFileChooser->setFilePath(CMakeTool::searchQchFile(m_binaryChooser->filePath()));
}
-void CMakeToolItemConfigWidget::reload()
-{
- if (!m_id.isValid())
- return;
-
- const CMakeToolTreeItem *item = m_model->cmakeToolItem(m_id);
- if (!item)
- return;
-
- load(item);
-}
-
void CMakeToolItemConfigWidget::load(const CMakeToolTreeItem *item)
{
m_loadingItem = true; // avoid intermediate signal handling