1 files changed, 8 insertions, 9 deletions

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index ff3bc70788..3b0a06c2b9 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1245,7 +1245,6 @@ void DebuggerEngine::notifyEngineSetupOk()
     d->m_progress.setProgressValue(250);
     QTC_ASSERT(state() == EngineSetupRequested, qDebug() << this << state());
     setState(EngineSetupOk);
-    // Slaves will get called setupSlaveInferior() below.
     setState(EngineRunRequested);
     showMessage("CALL: RUN ENGINE");
     d->m_progress.setProgressValue(300);
@@ -1513,7 +1512,7 @@ void DebuggerEnginePrivate::updateState()
     m_detachAction.setEnabled(detachable);
 
     if (stopped)
-        QApplication::alert(ICore::mainWindow(), 3000);
+        QApplication::alert(ICore::dialogParent(), 3000);
 
     updateReverseActions();
 
@@ -1760,11 +1759,11 @@ void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) c
         case AppOutput:
         case AppStuff:
             d->m_logWindow->showOutput(channel, msg);
-            emit appendMessageRequested(msg, StdOutFormatSameLine, false);
+            emit appendMessageRequested(msg, StdOutFormat, false);
             break;
         case AppError:
             d->m_logWindow->showOutput(channel, msg);
-            emit appendMessageRequested(msg, StdErrFormatSameLine, false);
+            emit appendMessageRequested(msg, StdErrFormat, false);
             break;
         default:
             d->m_logWindow->showOutput(channel, msg);
@@ -2811,7 +2810,7 @@ void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp)
             const GlobalDebuggerOptions *options = Internal::globalDebuggerOptions();
             SourcePathRegExpMap globalRegExpSourceMap;
             globalRegExpSourceMap.reserve(options->sourcePathRegExpMap.size());
-            for (auto entry : qAsConst(options->sourcePathRegExpMap)) {
+            for (const auto &entry : qAsConst(options->sourcePathRegExpMap)) {
                 const QString expanded = Utils::globalMacroExpander()->expand(entry.second);
                 if (!expanded.isEmpty())
                     globalRegExpSourceMap.push_back(qMakePair(entry.first, expanded));
@@ -2827,10 +2826,10 @@ void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp)
                     for (auto itExp = globalRegExpSourceMap.begin(), itEnd = globalRegExpSourceMap.end();
                          itExp != itEnd;
                          ++itExp) {
-                        QRegExp exp = itExp->first;
-                        int index = exp.indexIn(string);
-                        if (index != -1) {
-                            rp.sourcePathMap.insert(string.left(index) + exp.cap(1), itExp->second);
+                        const QRegularExpressionMatch match = itExp->first.match(string);
+                        if (match.hasMatch()) {
+                            rp.sourcePathMap.insert(string.left(match.capturedStart()) + match.captured(1),
+                                                    itExp->second);
                             found = true;
                             break;
                         }