From c58da42babe5052e28a28a5ad79497b7d6f34de3 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 28 Nov 2018 18:52:19 +0100
Subject: QmakeProjectManager et al: Reduce use of qmake specific logic

Change-Id: I8f7e5d822ccb27e3ec241b814ec67aed7fe7539f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/ios/iosrunconfiguration.cpp | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'src/plugins/ios/iosrunconfiguration.cpp')

diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 5d085c1bc7..0d26ba7e8f 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -159,27 +159,13 @@ void IosRunConfiguration::updateEnabledState()
 
 bool IosRunConfiguration::canRunForNode(const Node *node) const
 {
-    return node->filePath() == profilePath();
-}
-
-FileName IosRunConfiguration::profilePath() const
-{
-    return FileName::fromString(buildKey());
-}
-
-static QmakeProFile *proFile(const IosRunConfiguration *rc)
-{
-    auto pro = qobject_cast<const QmakeProject *>(rc->target()->project());
-    QmakeProFile *proFile = pro ? pro->rootProFile() : nullptr;
-    if (proFile)
-        proFile = proFile->findProFile(rc->profilePath());
-    return proFile;
+    return node->filePath().toString() == buildKey();
 }
 
 QString IosRunConfiguration::applicationName() const
 {
-    QmakeProFile *pro = proFile(this);
-    if (pro) {
+    Project *project = target()->project();
+    if (auto pro = dynamic_cast<const QmakeProFileNode *>(project->findNodeForBuildKey(buildKey()))) {
         TargetInformation ti = pro->targetInformation();
         if (ti.valid)
             return ti.target;
@@ -197,7 +183,8 @@ FileName IosRunConfiguration::bundleDirectory() const
         return res;
     }
     if (BuildConfiguration *bc = target()->activeBuildConfiguration()) {
-        const QmakeProFile *pro = proFile(this);
+        Project *project = target()->project();
+        auto pro = dynamic_cast<const QmakeProFileNode *>(project->findNodeForBuildKey(buildKey()));
         if (pro) {
             TargetInformation ti = pro->targetInformation();
             if (ti.valid)
-- 
cgit v1.2.1