Commit b633838d authored by Daniel Teske's avatar Daniel Teske

Android: Fix debugging with DESTDIR

Task-number: QTCREATORBUG-12913
Change-Id: I29b5b86c47b7b618b96c0b32a6143b7830ed9cd3
Reviewed-by: default avatarBogDan Vatra <bogdan@kde.org>
parent 8a3a219b
......@@ -58,14 +58,20 @@ bool QmakeAndroidSupport::canHandle(const ProjectExplorer::Target *target) const
QStringList QmakeAndroidSupport::soLibSearchPath(const ProjectExplorer::Target *target) const
{
QStringList res;
QmakeBuildConfiguration *bc = qobject_cast<QmakeBuildConfiguration*>(target->activeBuildConfiguration());
QmakeProject *project = qobject_cast<QmakeProject*>(target->project());
Q_ASSERT(project);
if (!project)
return res;
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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment