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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: I762dbddb0f337e9a5fc4b113c7876813e9f45c9c
This commit is contained in:
Eike Ziller
2018-06-11 16:01:18 +02:00
parent 168e89e0a2 4cba1d7c71
commit 9b43b55dc0
62 changed files with 519 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmlprofiler/qmlprofilertool.cpp
View File

@@ -348,15 +348,23 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker)
QMessageBox *infoBox = new QMessageBox(ICore::mainWindow());
infoBox->setIcon(QMessageBox::Critical);
infoBox->setWindowTitle(Core::Constants::IDE_DISPLAY_NAME);
infoBox->setText(QmlProfilerTool::tr("Could not connect to the in-process QML profiler.\n"
"Do you want to retry?"));
const int interval = d->m_profilerConnections->retryInterval();
const int retries = d->m_profilerConnections->maximumRetries();
infoBox->setText(QmlProfilerTool::tr("Could not connect to the in-process QML profiler "
"within %1 s.\n"
"Do you want to retry and wait %2 s?")
.arg(interval * retries / 1000.0)
.arg(interval * 2 * retries / 1000.0));
infoBox->setStandardButtons(QMessageBox::Retry | QMessageBox::Cancel | QMessageBox::Help);
infoBox->setDefaultButton(QMessageBox::Retry);
infoBox->setModal(true);
connect(infoBox, &QDialog::finished, runWorker, [this, runWorker](int result) {
connect(infoBox, &QDialog::finished, runWorker, [this, runWorker, interval](int result) {
switch (result) {
case QMessageBox::Retry:
d->m_profilerConnections->setRetryInterval(interval * 2);
d->m_profilerConnections->retryConnect();
break;
case QMessageBox::Help:

15
src/plugins/qmlprofiler/tests/qmlprofilerclientmanager_test.cpp
View File

@@ -60,7 +60,8 @@ QtMessageHandler MessageHandler::defaultHandler;
QmlProfilerClientManagerTest::QmlProfilerClientManagerTest(QObject *parent) :
QObject(parent), modelManager(nullptr)
{
clientManager.setRetryParams(10, 10);
clientManager.setRetryInterval(10);
clientManager.setMaximumRetries(10);
}
void QmlProfilerClientManagerTest::testConnectionFailure_data()
@@ -115,7 +116,8 @@ void softAssertMessageHandler(QtMsgType type, const QMessageLogContext &context,
void QmlProfilerClientManagerTest::testConnectionFailure()
{
clientManager.setRetryParams(1, 2);
clientManager.setRetryInterval(1);
clientManager.setMaximumRetries(2);
// This triggers a lot of soft asserts. We test that it still doesn't crash and stays in a
// consistent state.
QByteArray fatalAsserts = qgetenv("QTC_FATAL_ASSERTS");
@@ -153,7 +155,8 @@ void QmlProfilerClientManagerTest::testConnectionFailure()
clientManager.disconnectFromServer();
qputenv("QTC_FATAL_ASSERTS", fatalAsserts);
clientManager.setRetryParams(10, 10);
clientManager.setRetryInterval(10);
clientManager.setMaximumRetries(10);
}
void QmlProfilerClientManagerTest::testUnresponsiveTcp()
@@ -384,7 +387,8 @@ void QmlProfilerClientManagerTest::testStopRecording()
{
QmlProfilerClientManager clientManager;
clientManager.setRetryParams(10, 10);
clientManager.setRetryInterval(10);
clientManager.setMaximumRetries(10);
QSignalSpy openedSpy(&clientManager, SIGNAL(connectionOpened()));
QSignalSpy closedSpy(&clientManager, SIGNAL(connectionClosed()));
@@ -420,7 +424,8 @@ void QmlProfilerClientManagerTest::testConnectionDrop()
QmlProfilerClientManager clientManager;
{
clientManager.setRetryParams(10, 10);
clientManager.setRetryInterval(10);
clientManager.setMaximumRetries(10);
clientManager.setProfilerStateManager(&stateManager);
clientManager.setModelManager(&modelManager);
clientManager.connectToServer(socketUrl);