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

QmakeProjectManager: Do not run the clean steps spuriously

Browse Source 
Amends c732667838.

Fixes: QTCREATORBUG-29451
Fixes: QTCREATORBUG-29481
Change-Id: Ib79977d49ec7650f025887ec956efde45a8efb7c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Christian Kandeler
2023-08-09 16:18:06 +02:00
parent 578ecfc846
commit 9c2527eea6
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -512,7 +512,9 @@ QWidget *QMakeStep::createConfigWidget()
connect(abisListWidget, &QListWidget::itemChanged, this, [this] { connect(abisListWidget, &QListWidget::itemChanged, this, [this] {
if (m_ignoreChanges.isLocked()) if (m_ignoreChanges.isLocked())
return; return;
handleAbiWidgetChange(); updateAbiWidgets();
if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration())
BuildManager::buildLists({bc->cleanSteps()});
}); });
connect(widget, &QObject::destroyed, this, [this] { connect(widget, &QObject::destroyed, this, [this] {
@@ -704,7 +706,7 @@ void QMakeStep::updateAbiWidgets()
item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
item->setCheckState(selectedAbis.contains(param) ? Qt::Checked : Qt::Unchecked); item->setCheckState(selectedAbis.contains(param) ? Qt::Checked : Qt::Unchecked);
} }
handleAbiWidgetChange(); abisChanged();
} }
} }
@@ -713,13 +715,6 @@ void QMakeStep::updateEffectiveQMakeCall()
m_effectiveCall->setValue(effectiveQMakeCall()); m_effectiveCall->setValue(effectiveQMakeCall());
} }
void QMakeStep::handleAbiWidgetChange()
{
abisChanged();
if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration())
BuildManager::buildLists({bc->cleanSteps()});
}
void QMakeStep::recompileMessageBoxFinished(int button) void QMakeStep::recompileMessageBoxFinished(int button)
{ {
if (button == QMessageBox::Yes) { if (button == QMessageBox::Yes) {

1
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -155,7 +155,6 @@ private:
void updateAbiWidgets(); void updateAbiWidgets();
void updateEffectiveQMakeCall(); void updateEffectiveQMakeCall();
void handleAbiWidgetChange();
Utils::CommandLine m_qmakeCommand; Utils::CommandLine m_qmakeCommand;
Utils::CommandLine m_makeCommand; Utils::CommandLine m_makeCommand;