From 0ff8b9e283b82d51789353e1f26d23d9068909fb Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 20 Apr 2015 12:36:21 +0200 Subject: [PATCH] Json Wizard: Fix unsetting of attributes This did trigger all kinds of side-effects, one of them was Task-number: QTCREATORBUG-14294 Change-Id: If39f827828e9c5a2559bd6b3b5392ac819fbd931 Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp index 3a932ebcef6..d14c40348e9 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp @@ -162,8 +162,10 @@ bool JsonWizard::boolFromVariant(const QVariant &v, Utils::MacroExpander *expand void JsonWizard::removeAttributeFromAllFiles(Core::GeneratedFile::Attribute a) { - for (int i = 0; i < m_files.count(); ++i) - m_files[i].file.setAttributes(m_files.at(i).file.attributes() ^ a); + for (int i = 0; i < m_files.count(); ++i) { + if (m_files.at(i).file.attributes() & a) + m_files[i].file.setAttributes(m_files.at(i).file.attributes() ^ a); + } } void JsonWizard::accept()