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

Android: Fix debugging with DESTDIR

Browse Source 
Task-number: QTCREATORBUG-12913
Change-Id: I29b5b86c47b7b618b96c0b32a6143b7830ed9cd3
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2014-09-25 16:15:27 +02:00
parent 8a3a219b49
commit b633838d00
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
View File

@@ -58,14 +58,20 @@ bool QmakeAndroidSupport::canHandle(const ProjectExplorer::Target *target) const
QStringList QmakeAndroidSupport::soLibSearchPath(const ProjectExplorer::Target *target) const QStringList QmakeAndroidSupport::soLibSearchPath(const ProjectExplorer::Target *target) const
{ {
QStringList res; QStringList res;
QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration*>(target->activeBuildConfiguration());
QmakeProject *project = qobject_cast<QmakeProject*>(target->project()); QmakeProject *project = qobject_cast<QmakeProject*>(target->project());
Q_ASSERT(project); Q_ASSERT(project);
if (!project) if (!project)
return res; return res;
foreach (QmakeProFileNode *node, project->allProFiles()) { foreach (QmakeProFileNode *node, project->allProFiles()) {
res << node->buildDir(bc); TargetInformation info = node->targetInformation();
res << info.buildDir;
QString destDir = info.destDir;
if (!destDir.isEmpty()) {
if (QFileInfo(destDir).isRelative())
destDir = QDir::cleanPath(info.buildDir + QLatin1Char('/') + destDir);
res << destDir;
}
} }
return res; return res;