From ad903824437f8c03b2ba781bc49bdbbc0af591c7 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 6 Mar 2013 17:02:42 +0100
Subject: [PATCH] Android: Remove "Edit rules.xml" button

It serves no pratical purpose.

Change-Id: I65494ca6be14c96baa6bad521f11e130edfc614a
Reviewed-by: BogDan Vatra <bogdan@kde.org>
---
 src/plugins/android/androiddeploystep.cpp       | 8 --------
 src/plugins/android/androiddeploystep.h         | 1 -
 src/plugins/android/androiddeploystepwidget.cpp | 6 ------
 src/plugins/android/androiddeploystepwidget.h   | 1 -
 src/plugins/android/androiddeploystepwidget.ui  | 7 -------
 5 files changed, 23 deletions(-)

diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp
index 35ca2f48f11..9f9fc4d2cea 100644
--- a/src/plugins/android/androiddeploystep.cpp
+++ b/src/plugins/android/androiddeploystep.cpp
@@ -263,14 +263,6 @@ int AndroidDeployStep::deviceAPILevel()
     return m_deviceAPILevel;
 }
 
-Utils::FileName AndroidDeployStep::localLibsRulesFilePath()
-{
-    Utils::FileName fileName = AndroidManager::localLibsRulesFilePath(target());
-    fileName.append(QLatin1String("/rules.xml"));
-
-    return fileName;
-}
-
 unsigned int AndroidDeployStep::remoteModificationTime(const QString &fullDestination, QHash<QString, unsigned int> *cache)
 {
     QString destination = QFileInfo(fullDestination).absolutePath();
diff --git a/src/plugins/android/androiddeploystep.h b/src/plugins/android/androiddeploystep.h
index 5b69569f2ad..0fa090aa54a 100644
--- a/src/plugins/android/androiddeploystep.h
+++ b/src/plugins/android/androiddeploystep.h
@@ -87,7 +87,6 @@ public:
 
     QString deviceSerialNumber();
     int deviceAPILevel();
-    Utils::FileName localLibsRulesFilePath();
 
     AndroidDeployAction deployAction();
     bool useLocalQtLibs();
diff --git a/src/plugins/android/androiddeploystepwidget.cpp b/src/plugins/android/androiddeploystepwidget.cpp
index 6c8e3519638..45a8373b742 100644
--- a/src/plugins/android/androiddeploystepwidget.cpp
+++ b/src/plugins/android/androiddeploystepwidget.cpp
@@ -62,7 +62,6 @@ AndroidDeployStepWidget::AndroidDeployStepWidget(AndroidDeployStep *step) :
     connect(ui->deployQtLibs, SIGNAL(clicked()), SLOT(setDeployLocalQtLibs()));
     connect(ui->chooseButton, SIGNAL(clicked()), SLOT(setQASIPackagePath()));
     connect(ui->useLocalQtLibs, SIGNAL(stateChanged(int)), SLOT(useLocalQtLibsStateChanged(int)));
-    connect(ui->editRulesFilePushButton, SIGNAL(clicked()), SLOT(editRulesFile()));
     connect(ui->cleanLibsPushButton, SIGNAL(clicked()), SLOT(cleanLibsOnDevice()));
 }
 
@@ -106,11 +105,6 @@ void AndroidDeployStepWidget::useLocalQtLibsStateChanged(int state)
     m_step->setUseLocalQtLibs(state == Qt::Checked);
 }
 
-void AndroidDeployStepWidget::editRulesFile()
-{
-    Core::ICore::instance()->openFiles(QStringList() << m_step->localLibsRulesFilePath().toString(), Core::ICore::SwitchMode);
-}
-
 void AndroidDeployStepWidget::cleanLibsOnDevice()
 {
     m_step->cleanLibsOnDevice();
diff --git a/src/plugins/android/androiddeploystepwidget.h b/src/plugins/android/androiddeploystepwidget.h
index 01fa278c717..90db7d43420 100644
--- a/src/plugins/android/androiddeploystepwidget.h
+++ b/src/plugins/android/androiddeploystepwidget.h
@@ -53,7 +53,6 @@ private slots:
     void setDeployLocalQtLibs();
     void setQASIPackagePath();
     void useLocalQtLibsStateChanged(int);
-    void editRulesFile();
     void cleanLibsOnDevice();
 
 private:
diff --git a/src/plugins/android/androiddeploystepwidget.ui b/src/plugins/android/androiddeploystepwidget.ui
index af75a521ee6..4458c494081 100644
--- a/src/plugins/android/androiddeploystepwidget.ui
+++ b/src/plugins/android/androiddeploystepwidget.ui
@@ -63,13 +63,6 @@ You must have Qt libraries compiled for that platform</string>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="editRulesFilePushButton">
-       <property name="text">
-        <string>Edit Rules File</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item row="2" column="0">