Merge remote-tracking branch 'origin/4.7'

Change-Id: I3c5d7e9e8c589ad4425cd89d61e1f572f5cb7997
This commit is contained in:
Eike Ziller
2018-06-19 10:03:28 +02:00
110 changed files with 913 additions and 260 deletions

View File

@@ -265,6 +265,7 @@ QmlEngine::QmlEngine()
connect(&d->applicationLauncher, &ApplicationLauncher::processStarted,
this, &QmlEngine::handleLauncherStarted);
debuggerConsole()->populateFileFinder();
debuggerConsole()->setScriptEvaluator([this](const QString &expr) {
executeDebuggerCommand(expr, QmlLanguage);
});