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

QmlProfiler: Open load and save dialogs deferred

Browse Source 
This works around QTBUG-56746, by decoupling the dialog from the
context menu.

Change-Id: I2f13b01003a10598e6f69b14bb7eb8e9141acad8
Task-number: QTCREATORBUG-17149
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Ulf Hermann
2016-10-26 13:34:44 +02:00
parent ca6f37f3bd
commit 2d95057434
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,13 +169,13 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent)
QAction *act = d->m_loadQmlTrace = new QAction(tr("Load QML Trace"), options); QAction *act = d->m_loadQmlTrace = new QAction(tr("Load QML Trace"), options);
command = ActionManager::registerAction(act, Constants::QmlProfilerLoadActionId); command = ActionManager::registerAction(act, Constants::QmlProfilerLoadActionId);
connect(act, &QAction::triggered, this, &QmlProfilerTool::showLoadDialog); connect(act, &QAction::triggered, this, &QmlProfilerTool::showLoadDialog, Qt::QueuedConnection);
options->addAction(command); options->addAction(command);
act = d->m_saveQmlTrace = new QAction(tr("Save QML Trace"), options); act = d->m_saveQmlTrace = new QAction(tr("Save QML Trace"), options);
d->m_saveQmlTrace->setEnabled(false); d->m_saveQmlTrace->setEnabled(false);
command = ActionManager::registerAction(act, Constants::QmlProfilerSaveActionId); command = ActionManager::registerAction(act, Constants::QmlProfilerSaveActionId);
connect(act, &QAction::triggered, this, &QmlProfilerTool::showSaveDialog); connect(act, &QAction::triggered, this, &QmlProfilerTool::showSaveDialog, Qt::QueuedConnection);
options->addAction(command); options->addAction(command);
d->m_recordingTimer.setInterval(100); d->m_recordingTimer.setInterval(100);