From b633838d0030c27c40ff438d3460f21f16ff9bb7 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Thu, 25 Sep 2014 16:15:27 +0200
Subject: [PATCH] Android: Fix debugging with DESTDIR

Task-number: QTCREATORBUG-12913
Change-Id: I29b5b86c47b7b618b96c0b32a6143b7830ed9cd3
Reviewed-by: BogDan Vatra <bogdan@kde.org>
---
 .../qmakeandroidsupport/qmakeandroidsupport.cpp        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
index 32c5c93a88e..edff3f089f9 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
@@ -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;