Commit 9a8ec083 authored by Kai Koehne's avatar Kai Koehne

Do not warn for combined engine if QML debugging has not been enabled

Do not bring up a message box when connecting to the QML debugging port,
but rather just log, and continue C++ debugging.

This mitigates the issue that, in some configurations, QML debugging is
enabled by default although the application might not be set up properly.

Change-Id: I29e89ada4bf14f57589c8c671452572b689cdbdb
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 6e2de168
......@@ -457,16 +457,22 @@ void QmlEngine::connectionStartupFailed()
void QmlEngine::appStartupFailed(const QString &errorMessage)
{
QMessageBox *infoBox = new QMessageBox(Core::ICore::mainWindow());
infoBox->setIcon(QMessageBox::Critical);
infoBox->setWindowTitle(tr("Qt Creator"));
infoBox->setText(tr("Could not connect to the in-process QML debugger."
"\n%1").arg(errorMessage));
infoBox->setStandardButtons(QMessageBox::Ok | QMessageBox::Help);
infoBox->setDefaultButton(QMessageBox::Ok);
connect(infoBox, SIGNAL(finished(int)),
this, SLOT(errorMessageBoxFinished(int)));
infoBox->show();
QString error = tr("Could not connect to the in-process QML debugger."
"\n%1").arg(errorMessage);
if (isMasterEngine()) {
QMessageBox *infoBox = new QMessageBox(Core::ICore::mainWindow());
infoBox->setIcon(QMessageBox::Critical);
infoBox->setWindowTitle(tr("Qt Creator"));
infoBox->setText(error);
infoBox->setStandardButtons(QMessageBox::Ok | QMessageBox::Help);
infoBox->setDefaultButton(QMessageBox::Ok);
connect(infoBox, SIGNAL(finished(int)),
this, SLOT(errorMessageBoxFinished(int)));
infoBox->show();
} else {
showMessage(error, StatusBar);
}
notifyEngineRunFailed();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment