From 56c873fdacdba47deea06d94869e730371cd71ec Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 22 Apr 2013 11:24:52 +0200
Subject: [PATCH] QNX: Fix startup warning about "program not set" from
 QProcess.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I962768b47f21558f122d1b679b3583899fc3c0be
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/qnx/blackberrydeviceconnection.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/plugins/qnx/blackberrydeviceconnection.cpp b/src/plugins/qnx/blackberrydeviceconnection.cpp
index 77ad6723dee..5db6264125d 100644
--- a/src/plugins/qnx/blackberrydeviceconnection.cpp
+++ b/src/plugins/qnx/blackberrydeviceconnection.cpp
@@ -71,6 +71,12 @@ void BlackBerryDeviceConnection::connectDevice(const ProjectExplorer::IDevice::C
     // Since killing the blackberry-connect script won't kill the java process it launches,
     // let's just call the java process directly instead.
     QString command = env.searchInPath(QLatin1String("java"));
+    if (command.isEmpty()) {
+        const QString line = tr("Error connecting to device: java could not be found in the environment.") + QLatin1Char('\n');
+        emit processOutput(line);
+        m_messageLog.append(line);
+        return;
+    }
 
     QStringList args;
     args << QLatin1String("-Xmx512M");