diff options
author | hjk <hjk@qt.io> | 2018-12-18 17:52:19 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-12-20 16:18:37 +0000 |
commit | 5d1114fe52e586632882ea59f92a42f6125258e9 (patch) | |
tree | 124bb11689284f86d454cd64fd5ca1c1fcf745b2 /src/plugins/android/androidbuildapkstep.cpp | |
parent | 51f93c0dfc479830e5a419cd99ffa5463f6cca9f (diff) | |
download | qt-creator-5d1114fe52e586632882ea59f92a42f6125258e9.tar.gz |
ProjectExplorer: Drop the target argument
... from ProjectNode::targetData and setTargetData, and rename them
to data and setData.
It was only used in the implementation to retrieve the right node,
instead move the responsibility to find the right node to the caller.
Current assumption is that the functions were always called on
the right node already.
Change-Id: I9ae7e8a7ed5c79b924b99fd9a6a652bad56d114a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/android/androidbuildapkstep.cpp')
-rw-r--r-- | src/plugins/android/androidbuildapkstep.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index c31241a54f..1afe920f54 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -186,7 +186,7 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) RunConfiguration *rc = target()->activeRunConfiguration(); const ProjectNode *node = rc ? target()->project()->findNodeForBuildKey(rc->buildKey()) : nullptr; - QFileInfo sourceDirInfo(node ? node->targetData(Constants::AndroidPackageSourceDir, target()).toString() : QString()); + QFileInfo sourceDirInfo(node ? node->data(Constants::AndroidPackageSourceDir).toString() : QString()); parser->setSourceDirectory(Utils::FileName::fromString(sourceDirInfo.canonicalFilePath())); parser->setBuildDirectory(Utils::FileName::fromString(bc->buildDirectory().appendPath(Constants::ANDROID_BUILDDIRECTORY).toString())); setOutputParser(parser); @@ -209,7 +209,7 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) QString inputFile; if (node) - inputFile = node->targetData(Constants::AndroidDeploySettingsFile, target()).toString(); + inputFile = node->data(Constants::AndroidDeploySettingsFile).toString(); if (inputFile.isEmpty()) { m_skipBuilding = true; |