Merge remote-tracking branch 'origin/4.3'

Change-Id: I266a41de38789922363d1d88e73726cdca608920
This commit is contained in:
Eike Ziller
2017-03-22 10:26:01 +01:00
67 changed files with 560 additions and 703 deletions

View File

@@ -91,6 +91,7 @@ bool FindMacroHandler::executeEvent(const MacroEvent &macroEvent)
currentFind->replace(macroEvent.value(BEFORE).toString(),
macroEvent.value(AFTER).toString(),
(Core::FindFlags)macroEvent.value(FLAGS).toInt());
break;
case REPLACESTEP:
currentFind->replaceStep(macroEvent.value(BEFORE).toString(),
macroEvent.value(AFTER).toString(),