Android: Replace setting for input .json file and use active rc instead

That's a more natural approach to select the application .pro file

Task-number: QTCREATORBUG-13732
Change-Id: I8c6745bea4b408e1d4f7ed2cd4e1d50798c60881
Reviewed-by: BogDan Vatra <bogdan@kde.org>

1 files changed, 1 insertions, 41 deletions

diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
index f551b7a4f8..187ecfe6aa 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
@@ -39,6 +39,7 @@
 #include <qmakeprojectmanager/qmakeproject.h>
 
 #include <QFileDialog>
+#include <QLabel>
 
 using QmakeProjectManager::QmakeProject;
 using QmakeProjectManager::QmakeProFileNode;
@@ -86,13 +87,6 @@ QmakeAndroidBuildApkWidget::QmakeAndroidBuildApkWidget(QmakeAndroidBuildApkStep
     m_extraLibraryListModel = new AndroidExtraLibraryListModel(static_cast<QmakeProject *>(m_step->project()), this);
     m_ui->androidExtraLibsListView->setModel(m_extraLibraryListModel);
 
-    updateInputFileUi();
-    connect(m_step, SIGNAL(inputFileChanged()),
-            SLOT(updateInputFileUi()));
-
-    connect(m_ui->inputFileComboBox, SIGNAL(currentIndexChanged(int)),
-            SLOT(inputFileComboBoxIndexChanged()));
-
     connect(m_ui->createAndroidTemplatesButton, SIGNAL(clicked()),
             SLOT(createAndroidTemplatesButton()));
 
@@ -116,40 +110,6 @@ QmakeAndroidBuildApkWidget::~QmakeAndroidBuildApkWidget()
     delete m_ui;
 }
 
-void QmakeAndroidBuildApkWidget::updateInputFileUi()
-{
-    QmakeProject *project
-            = static_cast<QmakeProject *>(m_step->project());
-    QList<QmakeProFileNode *> nodes = project->applicationProFiles();
-    int size = nodes.size();
-    if (size == 0 || size == 1) {
-        // there's nothing to select, e.g. before parsing
-        m_ui->inputFileLabel->setVisible(false);
-        m_ui->inputFileComboBox->setVisible(false);
-    } else {
-        m_ignoreChange = true;
-        m_ui->inputFileLabel->setVisible(true);
-        m_ui->inputFileComboBox->setVisible(true);
-
-        m_ui->inputFileComboBox->clear();
-        foreach (QmakeProFileNode *node, nodes)
-            m_ui->inputFileComboBox->addItem(node->displayName(), node->path());
-
-        int index = m_ui->inputFileComboBox->findData(m_step->proFilePathForInputFile());
-        m_ui->inputFileComboBox->setCurrentIndex(index);
-        m_ignoreChange = false;
-    }
-}
-
-void QmakeAndroidBuildApkWidget::inputFileComboBoxIndexChanged()
-{
-    if (m_ignoreChange)
-        return;
-
-    QString proFilePath = m_ui->inputFileComboBox->itemData(m_ui->inputFileComboBox->currentIndex()).toString();
-    m_step->setProFilePathForInputFile(proFilePath);
-}
-
 void QmakeAndroidBuildApkWidget::createAndroidTemplatesButton()
 {
     CreateAndroidManifestWizard wizard(m_step->target());