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

Android: Remove "Edit rules.xml" button

Browse Source 
It serves no pratical purpose.

Change-Id: I65494ca6be14c96baa6bad521f11e130edfc614a
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2013-03-06 17:02:42 +01:00
parent 7b30f3ea91
commit ad90382443
5 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androiddeploystep.cpp
View File

@@ -263,14 +263,6 @@ int AndroidDeployStep::deviceAPILevel()
return m_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) unsigned int AndroidDeployStep::remoteModificationTime(const QString &fullDestination, QHash<QString, unsigned int> *cache)
{ {
QString destination = QFileInfo(fullDestination).absolutePath(); QString destination = QFileInfo(fullDestination).absolutePath();

1
src/plugins/android/androiddeploystep.h
View File

@@ -87,7 +87,6 @@ public:
QString deviceSerialNumber(); QString deviceSerialNumber();
int deviceAPILevel(); int deviceAPILevel();
Utils::FileName localLibsRulesFilePath();
AndroidDeployAction deployAction(); AndroidDeployAction deployAction();
bool useLocalQtLibs(); bool useLocalQtLibs();

6
src/plugins/android/androiddeploystepwidget.cpp
View File

@@ -62,7 +62,6 @@ AndroidDeployStepWidget::AndroidDeployStepWidget(AndroidDeployStep *step) :
connect(ui->deployQtLibs, SIGNAL(clicked()), SLOT(setDeployLocalQtLibs())); connect(ui->deployQtLibs, SIGNAL(clicked()), SLOT(setDeployLocalQtLibs()));
connect(ui->chooseButton, SIGNAL(clicked()), SLOT(setQASIPackagePath())); connect(ui->chooseButton, SIGNAL(clicked()), SLOT(setQASIPackagePath()));
connect(ui->useLocalQtLibs, SIGNAL(stateChanged(int)), SLOT(useLocalQtLibsStateChanged(int))); connect(ui->useLocalQtLibs, SIGNAL(stateChanged(int)), SLOT(useLocalQtLibsStateChanged(int)));
connect(ui->editRulesFilePushButton, SIGNAL(clicked()), SLOT(editRulesFile()));
connect(ui->cleanLibsPushButton, SIGNAL(clicked()), SLOT(cleanLibsOnDevice())); connect(ui->cleanLibsPushButton, SIGNAL(clicked()), SLOT(cleanLibsOnDevice()));
} }
@@ -106,11 +105,6 @@ void AndroidDeployStepWidget::useLocalQtLibsStateChanged(int state)
m_step->setUseLocalQtLibs(state == Qt::Checked); m_step->setUseLocalQtLibs(state == Qt::Checked);
} }
void AndroidDeployStepWidget::editRulesFile()
{
Core::ICore::instance()->openFiles(QStringList() << m_step->localLibsRulesFilePath().toString(), Core::ICore::SwitchMode);
}
void AndroidDeployStepWidget::cleanLibsOnDevice() void AndroidDeployStepWidget::cleanLibsOnDevice()
{ {
m_step->cleanLibsOnDevice(); m_step->cleanLibsOnDevice();

1
src/plugins/android/androiddeploystepwidget.h
View File

@@ -53,7 +53,6 @@ private slots:
void setDeployLocalQtLibs(); void setDeployLocalQtLibs();
void setQASIPackagePath(); void setQASIPackagePath();
void useLocalQtLibsStateChanged(int); void useLocalQtLibsStateChanged(int);
void editRulesFile();
void cleanLibsOnDevice(); void cleanLibsOnDevice();
private: private:

7
src/plugins/android/androiddeploystepwidget.ui
View File

@@ -63,13 +63,6 @@ You must have Qt libraries compiled for that platform</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="editRulesFilePushButton">
<property name="text">
<string>Edit Rules File</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">