feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BlackBerry: Ignore current directory when deploying Qt libraries to device

Browse Source 
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>
This commit is contained in:
Tobias Nätterlund
2014-02-13 10:46:14 +01:00
committed by Tobias Nätterlund
parent 32cb0326ab
commit 0d46aa4099
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qnx/blackberrydeployqtlibrariesdialog.cpp
View File

@@ -238,6 +238,9 @@ QList<ProjectExplorer::DeployableFile> BlackBerryDeployQtLibrariesDialog::gather
const QString &dirPath, const QString &baseDirPath) const QString &dirPath, const QString &baseDirPath)
{ {
QList<ProjectExplorer::DeployableFile> result; QList<ProjectExplorer::DeployableFile> result;
if (dirPath.isEmpty())
return result;
QDir dir(dirPath); QDir dir(dirPath);
QFileInfoList list = dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); QFileInfoList list = dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);