summaryrefslogtreecommitdiff
path: root/src/plugins/qnx/blackberrydeviceconnection.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-04-22 11:24:52 +0200
committerTobias Hunger <tobias.hunger@digia.com>2013-04-25 17:49:20 +0200
commit56c873fdacdba47deea06d94869e730371cd71ec (patch)
tree01f22613ceabe2e17cac504430afb3f9ff6217ec /src/plugins/qnx/blackberrydeviceconnection.cpp
parentcba1da46788f4a6e7665788cbc976c34fc9232c1 (diff)
downloadqt-creator-56c873fdacdba47deea06d94869e730371cd71ec.tar.gz
QNX: Fix startup warning about "program not set" from QProcess.
Change-Id: I962768b47f21558f122d1b679b3583899fc3c0be Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qnx/blackberrydeviceconnection.cpp')
-rw-r--r--src/plugins/qnx/blackberrydeviceconnection.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/qnx/blackberrydeviceconnection.cpp b/src/plugins/qnx/blackberrydeviceconnection.cpp
index 77ad6723de..5db6264125 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");