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

Merge remote-tracking branch 'origin/2.4'

Browse Source 
Conflicts:
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: Ie1ecdbaefb9cabebd90bc7c0f8837cc31dbac5af
This commit is contained in:
Eike Ziller
2011-10-17 16:44:41 +02:00
parent 47bda54f07 2a271e396c
commit 1868dd94f0
12 changed files with 37 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -503,16 +503,39 @@ void QmlProfilerTool::clearDisplay()
static void startRemoteTool(IAnalyzerTool *tool, StartMode mode)
{
Q_UNUSED(tool);
QmlProfilerAttachDialog dialog;
if (dialog.exec() != QDialog::Accepted)
return;
QString host;
quint16 port;
QString sysroot;
{
QSettings *settings = Core::ICore::instance()->settings();
host = settings->value(QLatin1String("AnalyzerQmlAttachDialog/host"), QLatin1String("localhost")).toString();
port = settings->value(QLatin1String("AnalyzerQmlAttachDialog/port"), 3768).toInt();
QmlProfilerAttachDialog dialog;
dialog.setAddress(host);
dialog.setPort(port);
if (dialog.exec() != QDialog::Accepted)
return;
host = dialog.address();
port = dialog.port();
sysroot = dialog.sysroot();
settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/host"), host);
settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/port"), port);
}
AnalyzerStartParameters sp;
sp.toolId = tool->id();
sp.startMode = mode;
sp.connParams.host = dialog.address();
sp.connParams.port = dialog.port();
sp.sysroot = dialog.sysroot();
sp.connParams.host = host;
sp.connParams.port = port;
sp.sysroot = sysroot;
AnalyzerRunControl *rc = new AnalyzerRunControl(tool, sp, 0);
QObject::connect(AnalyzerManager::stopAction(), SIGNAL(triggered()), rc, SLOT(stopIt()));