summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2015-09-10 15:49:21 +0200
committerTobias Hunger <tobias.hunger@theqtcompany.com>2015-09-10 14:18:30 +0000
commit9b8f713bc83c6462bc86d114d3104ce252e471bb (patch)
tree4abb5babed78f5aefb3f01faede3e5434b8c1f20
parent915f68deac95bf17bd97d1a2644264afb0b86f0b (diff)
downloadqt-creator-9b8f713bc83c6462bc86d114d3104ce252e471bb.tar.gz
Wizards: Respect cancel button when asking about overwriting files
Change-Id: Ica567fd53aedf074976165401b98558e75e3bb56 Task-number: QTCREATORBUG-15022 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
index 035eae6d64..bbea9e4161 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
@@ -218,7 +218,7 @@ void JsonWizard::accept()
emit prePromptForOverwrite(m_files);
JsonWizardGenerator::OverwriteResult overwrite =
JsonWizardGenerator::promptForOverwrite(&m_files, &errorMessage);
- if (overwrite == JsonWizardGenerator::OverwriteError) {
+ if (overwrite != JsonWizardGenerator::OverwriteOk) {
if (!errorMessage.isEmpty())
QMessageBox::warning(this, tr("Failed to Overwrite Files"), errorMessage);
return;