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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Change-Id: I30148c16cbb66ef670caaf1c74dccff47069bf68
This commit is contained in:
Eike Ziller
2015-09-15 07:40:57 +02:00
parent e818a4ed90 73fbf3afd1
commit 054ed354e0
21 changed files with 1492 additions and 3924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
View File

@@ -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;