summaryrefslogtreecommitdiff
path: root/src/plugins/android
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-05-03 17:26:49 +0200
committerhjk <hjk@qt.io>2019-05-14 13:30:34 +0000
commitce449e4219e720469bbaae0cf29dd72f2eef1383 (patch)
tree8ea6a644db51f90a4eef4c5c1fb0b6e95dcdb5fc /src/plugins/android
parentf3b6d60a01a0c0df2349c297be1ab1e637f1a7ca (diff)
downloadqt-creator-ce449e4219e720469bbaae0cf29dd72f2eef1383.tar.gz
ProjectExplorer: Remove BuildTargetInfoList wrapper class
Change-Id: I1a2ae06ec8c5b7278abca2386834d7edd31597d7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/android')
-rw-r--r--src/plugins/android/createandroidmanifestwizard.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp
index 2476acbaf1..56a7fda56c 100644
--- a/src/plugins/android/createandroidmanifestwizard.cpp
+++ b/src/plugins/android/createandroidmanifestwizard.cpp
@@ -86,8 +86,7 @@ ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard)
currentBuildTarget = rc->buildKey();
m_comboBox = new QComboBox(this);
- const BuildTargetInfoList buildTargets = wizard->target()->applicationTargets();
- for (const BuildTargetInfo &bti : buildTargets.list) {
+ for (const BuildTargetInfo &bti : wizard->target()->applicationTargets()) {
const QString displayName = bti.buildKey;
m_comboBox->addItem(displayName, QVariant(bti.buildKey)); // TODO something more?
if (bti.buildKey == currentBuildTarget)
@@ -214,15 +213,15 @@ CreateAndroidManifestWizard::CreateAndroidManifestWizard(ProjectExplorer::Target
{
setWindowTitle(tr("Create Android Template Files Wizard"));
- const BuildTargetInfoList buildTargets = target->applicationTargets();
+ const QList<BuildTargetInfo> buildTargets = target->applicationTargets();
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
m_copyGradle = version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0);
- if (buildTargets.list.isEmpty()) {
+ if (buildTargets.isEmpty()) {
// oh uhm can't create anything
addPage(new NoApplicationProFilePage(this));
- } else if (buildTargets.list.size() == 1) {
- setBuildKey(buildTargets.list.first().buildKey);
+ } else if (buildTargets.size() == 1) {
+ setBuildKey(buildTargets.first().buildKey);
addPage(new ChooseDirectoryPage(this));
} else {
addPage(new ChooseProFilePage(this));