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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: I2d78020f10aa66fdded63883030313e0c411ce02
This commit is contained in:
Orgad Shaneh
2017-10-15 00:23:08 +03:00
parent 5a7a8cbf74 b67bf73dc7
commit 7a04014f9f
33 changed files with 189 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -335,7 +335,7 @@ void QmlEngine::handleLauncherStarted()
{
// FIXME: The QmlEngine never calls notifyInferiorPid() triggering the
// raising, so do it here manually for now.
runControl()->applicationProcessHandle().activate();
runTool()->runControl()->applicationProcessHandle().activate();
tryToConnect();
}