QMakeAndroid: Replace QmakeAndroidSupport::projectFilePath

... by existing base functionality.

Change-Id: I38bc25cba5f50b7694df73f57bec67a250ac9bdf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/android/androidextralibrarylistmodel.cpp b/src/plugins/android/androidextralibrarylistmodel.cpp
index 60956c963a..500664a315 100644
--- a/src/plugins/android/androidextralibrarylistmodel.cpp
+++ b/src/plugins/android/androidextralibrarylistmodel.cpp
@@ -30,9 +30,12 @@
 #include <android/androidmanager.h>
 
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectnodes.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 
+using namespace ProjectExplorer;
+
 namespace Android {
 
 AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(ProjectExplorer::Target *target,
@@ -109,11 +112,16 @@ void AndroidExtraLibraryListModel::addEntries(const QStringList &list)
 {
     AndroidQtSupport *qtSupport = Android::AndroidManager::androidQtSupport(m_target);
     QTC_ASSERT(qtSupport, return);
-    Utils::FileName projectFilePath = qtSupport->projectFilePath(m_target);
+
+    RunConfiguration *rc = m_target->activeRunConfiguration();
+    QTC_ASSERT(rc, return);
+
+    const ProjectNode *node = m_target->project()->findNodeForBuildKey(rc->buildKey());
+    QTC_ASSERT(node, return);
 
     beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + list.size());
 
-    const QDir dir = qtSupport->projectFilePath(m_target).toFileInfo().absoluteDir();
+    const QDir dir = node->filePath().toFileInfo().absoluteDir();
     for (const QString &path : list)
         m_entries += "$$PWD/" + dir.relativeFilePath(path);
 
diff --git a/src/plugins/android/androidqtsupport.h b/src/plugins/android/androidqtsupport.h
index 4b805e0559..4046334b39 100644
--- a/src/plugins/android/androidqtsupport.h
+++ b/src/plugins/android/androidqtsupport.h
@@ -70,7 +70,6 @@ public:
     virtual bool parseInProgress(const ProjectExplorer::Target *target) const = 0;
     virtual bool validParse(const ProjectExplorer::Target *target) const = 0;
     virtual bool extraLibraryEnabled(const ProjectExplorer::Target *target) const = 0;
-    virtual Utils::FileName projectFilePath(const ProjectExplorer::Target *target) const = 0;
 
     virtual void addFiles(const ProjectExplorer::Target *target, const QString &buildKey,
                           const QStringList &addedFiles) const = 0;
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
index e8ef477f04..c5d91ce00e 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
@@ -105,12 +105,6 @@ bool QmakeAndroidSupport::extraLibraryEnabled(const Target *target) const
     return pro && !pro->parseInProgress();
 }
 
-FileName QmakeAndroidSupport::projectFilePath(const Target *target) const
-{
-    QmakeProFile *pro = applicationProFile(target);
-    return pro ? pro->filePath() : FileName();
-}
-
 bool QmakeAndroidSupport::setTargetData(Core::Id role, const QVariant &value, const Target *target) const
 {
     QmakeProFile *pro = applicationProFile(target);
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
index 766371ef0e..ce972411c9 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
@@ -45,7 +45,6 @@ public:
     bool parseInProgress(const ProjectExplorer::Target *target) const override;
     bool validParse(const ProjectExplorer::Target *target) const override;
     bool extraLibraryEnabled(const ProjectExplorer::Target *target) const override;
-    Utils::FileName projectFilePath(const ProjectExplorer::Target *target) const override;
 
     void addFiles(const ProjectExplorer::Target *target, const QString &buildKey,
                   const QStringList &addedFiles) const override;