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

debugger: merge notifyEngineRemoteSetup* and handleRemoteSetup*

Browse Source 
Change-Id: I89abcb0dcceef6767cb3e78f4e85c1cd718e78c1
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-06-13 11:29:26 +02:00
committed by hjk
parent d601e3799f
commit ceb575741c
17 changed files with 56 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -627,14 +627,12 @@ void QmlEngine::stopApplicationLauncher()
}
}
void QmlEngine::handleRemoteSetupDone(int gdbServerPort, int qmlPort)
void QmlEngine::notifyEngineRemoteSetupDone(int gdbServerPort, int qmlPort)
{
Q_UNUSED(gdbServerPort);
if (qmlPort != -1)
startParameters().qmlServerPort = qmlPort;
notifyEngineRemoteSetupDone();
DebuggerEngine::notifyEngineRemoteSetupDone(gdbServerPort, qmlPort);
notifyEngineSetupOk();
// The remote setup can take while especialy with mixed debugging.
@@ -644,13 +642,13 @@ void QmlEngine::handleRemoteSetupDone(int gdbServerPort, int qmlPort)
m_noDebugOutputTimer.setInterval(60000);
}
void QmlEngine::handleRemoteSetupFailed(const QString &message)
void QmlEngine::notifyEngineRemoteSetupFailed(const QString &message)
{
DebuggerEngine::notifyEngineRemoteSetupFailed(message);
if (isMasterEngine())
QMessageBox::critical(0,tr("Failed to start application"),
tr("Application startup failed: %1").arg(message));
notifyEngineRemoteSetupFailed();
notifyEngineSetupFailed();
}
@@ -682,7 +680,7 @@ void QmlEngine::shutdownEngine()
void QmlEngine::setupEngine()
{
if (startParameters().requestRemoteSetup) {
if (startParameters().remoteSetupNeeded) {
// we need to get the port first
notifyEngineRequestRemoteSetup();
} else {