Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a

3 files changed, 15 insertions, 10 deletions

diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
index aad9c0f6e8..3b13e95071 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
@@ -219,7 +219,7 @@ void BlackBerryDeviceConfigurationWizardSshKeyPage::findMatchingPublicKey(const
 {
     const QString candidate = privateKeyPath + QLatin1String(".pub");
     if (QFileInfo(candidate).exists())
-        m_ui->publicKey->setText(candidate);
+        m_ui->publicKey->setText(QDir::toNativeSeparators(candidate));
     else
         m_ui->publicKey->clear();
 }
@@ -239,7 +239,7 @@ void BlackBerryDeviceConfigurationWizardSshKeyPage::processSshKeys(bool success)
         return;
 
     m_ui->privateKey->setFileName(Utils::FileName::fromString(m_generatedPrivateKeyPath));
-    m_ui->publicKey->setText(publicKeyPath);
+    m_ui->publicKey->setText(QDir::toNativeSeparators(publicKeyPath));
 
     emit completeChanged();
 }
diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp
index ac7cea766c..0605d02579 100644
--- a/src/plugins/qnx/qnxanalyzesupport.cpp
+++ b/src/plugins/qnx/qnxanalyzesupport.cpp
@@ -56,6 +56,8 @@ QnxAnalyzeSupport::QnxAnalyzeSupport(QnxRunConfiguration *runConfig,
 
     connect(m_engine, SIGNAL(starting(const Analyzer::IAnalyzerEngine*)),
             SLOT(handleAdapterSetupRequested()));
+    connect(&m_outputParser, SIGNAL(waitingForConnectionOnPort(quint16)),
+            SLOT(remoteIsRunning()));
 }
 
 void QnxAnalyzeSupport::handleAdapterSetupRequested()
@@ -82,13 +84,6 @@ void QnxAnalyzeSupport::startExecution()
     appRunner()->start(device(), command.toUtf8());
 }
 
-void QnxAnalyzeSupport::handleRemoteProcessStarted()
-{
-    QnxAbstractRunSupport::handleRemoteProcessStarted();
-    if (m_engine)
-        m_engine->notifyRemoteSetupDone(m_qmlPort);
-}
-
 void QnxAnalyzeSupport::handleRemoteProcessFinished(bool success)
 {
     if (m_engine || state() == Inactive)
@@ -127,8 +122,15 @@ void QnxAnalyzeSupport::handleError(const QString &error)
     }
 }
 
+void QnxAnalyzeSupport::remoteIsRunning()
+{
+    if (m_engine)
+        m_engine->notifyRemoteSetupDone(m_qmlPort);
+}
+
 void QnxAnalyzeSupport::showMessage(const QString &msg, Utils::OutputFormat format)
 {
     if (state() != Inactive && m_engine)
         m_engine->logApplicationMessage(msg, format);
+    m_outputParser.processOutput(msg);
 }
diff --git a/src/plugins/qnx/qnxanalyzesupport.h b/src/plugins/qnx/qnxanalyzesupport.h
index 66fa580abd..69aa813ad8 100644
--- a/src/plugins/qnx/qnxanalyzesupport.h
+++ b/src/plugins/qnx/qnxanalyzesupport.h
@@ -34,6 +34,7 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/outputformat.h>
+#include <qmldebug/qmloutputparser.h>
 
 namespace Analyzer { class IAnalyzerEngine; }
 
@@ -54,17 +55,19 @@ public slots:
 private slots:
     void handleAdapterSetupRequested();
 
-    void handleRemoteProcessStarted();
     void handleRemoteProcessFinished(bool success);
     void handleProgressReport(const QString &progressOutput);
     void handleRemoteOutput(const QByteArray &output);
     void handleError(const QString &error);
 
+    void remoteIsRunning();
+
 private:
     void startExecution();
     void showMessage(const QString &, Utils::OutputFormat);
 
     Analyzer::IAnalyzerEngine *m_engine;
+    QmlDebug::QmlOutputParser m_outputParser;
     int m_qmlPort;
 };