From 6e9214e995f8f480d3b227d7931f4ac7dc83e03f Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 19 Mar 2012 17:03:00 +0100
Subject: [PATCH] QmlProfiler: Set sysroot for embedded targets
Change-Id: I4ea618fecb8901038b9be716fa8e7e54fa3cd931
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
---
src/plugins/qmlprofiler/qmlprofilertool.cpp | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index 645096e7f90..fa01ea592d5 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -392,6 +392,19 @@ bool QmlProfilerTool::canRun(RunConfiguration *runConfiguration, RunMode mode) c
return false;
}
+static QString sysroot(RunConfiguration *runConfig)
+{
+ QTC_ASSERT(runConfig, return QString())
+ if (Qt4ProjectManager::Qt4BuildConfiguration *buildConfig =
+ qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration*>(
+ runConfig->target()->activeBuildConfiguration())) {
+ if (QtSupport::BaseQtVersion *qtVersion = buildConfig->qtVersion())
+ return qtVersion->systemRoot();
+ }
+
+ return QString();
+}
+
AnalyzerStartParameters QmlProfilerTool::createStartParameters(RunConfiguration *runConfiguration, RunMode mode) const
{
Q_UNUSED(mode);
@@ -426,6 +439,7 @@ AnalyzerStartParameters QmlProfilerTool::createStartParameters(RunConfiguration
sp.connParams = rc3->deviceConfig()->sshParameters();
sp.analyzerCmdPrefix = rc3->commandPrefix();
sp.displayName = rc3->displayName();
+ sp.sysroot = sysroot(rc3);
} else if (Qt4ProjectManager::S60DeviceRunConfiguration *rc4 =
qobject_cast<Qt4ProjectManager::S60DeviceRunConfiguration *>(runConfiguration)) {
Qt4ProjectManager::S60DeployConfiguration *deployConf =
@@ -435,6 +449,7 @@ AnalyzerStartParameters QmlProfilerTool::createStartParameters(RunConfiguration
sp.displayName = rc4->displayName();
sp.connParams.host = deployConf->deviceAddress();
sp.connParams.port = rc4->debuggerAspect()->qmlDebugServerPort();
+ sp.sysroot = sysroot(rc4);
} else {
// What could that be?
QTC_ASSERT(false, return sp);
--
GitLab