5 files changed, 40 insertions, 2 deletions
diff --git a/src/plugins/analyzerbase/analyzerstartparameters.h b/src/plugins/analyzerbase/analyzerstartparameters.h
index 5265e7099f..68d6f61d2e 100644
--- a/src/plugins/analyzerbase/analyzerstartparameters.h
+++ b/src/plugins/analyzerbase/analyzerstartparameters.h
@@ -63,6 +63,7 @@ public:
     QString displayName;
     Utils::Environment environment;
     QString workingDirectory;
+    QString sysroot;
 };
 
 } // namespace Analyzer
diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp
index a5f52a1751..2933950bae 100644
--- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp
@@ -58,6 +58,11 @@ uint QmlProfilerAttachDialog::port() const
     return ui->portSpinBox->value();
 }
 
+QString QmlProfilerAttachDialog::sysroot() const
+{
+    return ui->sysrootChooser->path();
+}
+
 void QmlProfilerAttachDialog::setAddress(const QString &address)
 {
     ui->addressLineEdit->setText(address);
@@ -68,5 +73,10 @@ void QmlProfilerAttachDialog::setPort(uint port)
     ui->portSpinBox->setValue(port);
 }
 
+void QmlProfilerAttachDialog::setSysroot(const QString &sysroot)
+{
+    ui->sysrootChooser->setPath(sysroot);
+}
+
 } // namespace Internal
 } // namespace QmlProfiler
diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.h b/src/plugins/qmlprofiler/qmlprofilerattachdialog.h
index 400e4d8937..b351d49c2d 100644
--- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.h
+++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.h
@@ -52,9 +52,11 @@ public:
 
     QString address() const;
     uint port() const;
+    QString sysroot() const;
 
     void setAddress(const QString &address);
     void setPort(uint port);
+    void setSysroot(const QString &sysroot);
 
 private:
     Ui::QmlProfilerAttachDialog *ui;
diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.ui b/src/plugins/qmlprofiler/qmlprofilerattachdialog.ui
index 7d74b39e3f..c920c4d160 100644
--- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.ui
+++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>185</width>
-    <height>115</height>
+    <width>203</width>
+    <height>136</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -56,6 +56,19 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Sys&amp;root:</string>
+       </property>
+       <property name="buddy">
+        <cstring>sysrootChooser</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="Utils::PathChooser" name="sysrootChooser" native="true"/>
+     </item>
     </layout>
    </item>
    <item>
@@ -70,6 +83,14 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Utils::PathChooser</class>
+   <extends>QWidget</extends>
+   <header location="global">utils/pathchooser.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index d17c6f50f9..7ac3bd86bb 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -120,6 +120,7 @@ public:
     QString m_tcpHost;
     quint64 m_tcpPort;
     QString m_ostDevice;
+    QString m_sysroot;
 };
 
 QmlProfilerTool::QmlProfilerTool(QObject *parent)
@@ -254,6 +255,8 @@ IAnalyzerEngine *QmlProfilerTool::createEngine(const AnalyzerStartParameters &sp
         connect(d->m_project, SIGNAL(fileListChanged()), this, SLOT(updateProjectFileList()));
     }
 
+    d->m_projectFinder.setSysroot(sp.sysroot);
+
     connect(engine, SIGNAL(processRunning(int)), this, SLOT(connectClient(int)));
     connect(engine, SIGNAL(finished()), this, SLOT(disconnectClient()));
     connect(engine, SIGNAL(finished()), this, SLOT(correctTimer()));
@@ -509,6 +512,7 @@ static void startRemoteTool(IAnalyzerTool *tool, StartMode mode)
     sp.startMode = mode;
     sp.connParams.host = dialog.address();
     sp.connParams.port = dialog.port();
+    sp.sysroot = dialog.sysroot();
 
     AnalyzerRunControl *rc = new AnalyzerRunControl(tool, sp, 0);
     QObject::connect(AnalyzerManager::stopAction(), SIGNAL(triggered()), rc, SLOT(stopIt()));