From cb12ef8f910370ff98714f3ef6b45b25200f3608 Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@nokia.com>
Date: Thu, 10 May 2012 14:30:32 +0200
Subject: [PATCH] QmlProfiler: Set sysroot for embedded targets

Change-Id: Ieae3956a6ed47c40392b1f5bb2af8b97e01a19b0
Reviewed-by: Kai Koehne <kai.koehne@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 37c51acdb07..a55b59a1293 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -318,6 +318,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);
@@ -352,6 +365,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 =
@@ -361,6 +375,7 @@ AnalyzerStartParameters QmlProfilerTool::createStartParameters(RunConfiguration
         sp.displayName = rc4->displayName();
         sp.connParams.host = deployConf->device()->address();
         sp.connParams.port = rc4->debuggerAspect()->qmlDebugServerPort();
+        sp.sysroot = sysroot(rc4);
     } else {
         // What could that be?
         QTC_ASSERT(false, return sp);