From 0d46aa40993eefe2a0455804ddc061d24b03d981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20N=C3=A4tterlund?= <tobias.naetterlund.qnx@kdab.com>
Date: Thu, 13 Feb 2014 10:46:14 +0100
Subject: [PATCH] BlackBerry: Ignore current directory when deploying Qt
 libraries to device

Make sure to handle the case where the string returned from BaseQtVersion::versionInfo()
is empty, as that would lead to the current folder being included in the files
to deploy to the device.

Change-Id: Ic715fe078bbadf3edbaefc68aeca5eea06af8417
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
---
 src/plugins/qnx/blackberrydeployqtlibrariesdialog.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/qnx/blackberrydeployqtlibrariesdialog.cpp b/src/plugins/qnx/blackberrydeployqtlibrariesdialog.cpp
index c29c3affa3a..c50a4b651f0 100644
--- a/src/plugins/qnx/blackberrydeployqtlibrariesdialog.cpp
+++ b/src/plugins/qnx/blackberrydeployqtlibrariesdialog.cpp
@@ -238,6 +238,9 @@ QList<ProjectExplorer::DeployableFile> BlackBerryDeployQtLibrariesDialog::gather
         const QString &dirPath, const QString &baseDirPath)
 {
     QList<ProjectExplorer::DeployableFile> result;
+    if (dirPath.isEmpty())
+        return result;
+
     QDir dir(dirPath);
     QFileInfoList list = dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);