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

QmakeProjectManager et al: Reduce use of qmake specific logic

Browse Source 
Change-Id: I8f7e5d822ccb27e3ec241b814ec67aed7fe7539f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2018-11-28 18:52:19 +01:00
parent d6b1e5653b
commit c58da42bab
5 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/ios/iosrunconfiguration.cpp
View File

@@ -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)