forked from qt-creator/qt-creator
Move qmake specific part to qmake plugin, generalize android support
- Split up androiddeployqt into two steps: One building the apk, and one deploying it to the device. - The build apk step base class AndroidBuildApkStep is ihneritaged by the qmake specific class QmakeAndroidBuildApkStep. - The deployment step is still called androiddeployqt - Move all qmake specific code to the qmakeprojectmanager plguin - Flip the depencency between the android and qmake plugin, now the qmake plugin depends on the android plugin, implementing a interface the android plugin provides. - Note: This removes the debug deployment for now. Change-Id: I1c386640159ed14b637668abde8eb3b9009ab803 Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
committed by
Daniel Teske
parent
4657ac7452
commit
64e5a543a8
@@ -38,12 +38,10 @@ QT_BEGIN_NAMESPACE
|
||||
namespace Ui { class AndroidDeployQtWidget; }
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace QmakeProjectManager { class QmakeBuildConfiguration; }
|
||||
|
||||
namespace Android {
|
||||
namespace Internal {
|
||||
class AndroidDeployQtStep;
|
||||
class AndroidExtraLibraryListModel;
|
||||
|
||||
class AndroidDeployQtWidget : public ProjectExplorer::BuildStepConfigWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -53,39 +51,16 @@ public:
|
||||
~AndroidDeployQtWidget();
|
||||
|
||||
private slots:
|
||||
void setTargetSdk(const QString &sdk);
|
||||
void setMinistro();
|
||||
void setDeployLocalQtLibs();
|
||||
void setBundleQtLibs();
|
||||
void installMinistro();
|
||||
void cleanLibsOnDevice();
|
||||
void resetDefaultDevices();
|
||||
void createKeyStore();
|
||||
void certificatesAliasComboBoxCurrentIndexChanged(const QString &alias);
|
||||
void certificatesAliasComboBoxActivated(const QString &alias);
|
||||
void activeBuildConfigurationChanged();
|
||||
void updateSigningWarning();
|
||||
void openPackageLocationCheckBoxToggled(bool checked);
|
||||
void verboseOutputCheckBoxToggled(bool checked);
|
||||
void updateKeyStorePath(const QString &path);
|
||||
void signPackageCheckBoxToggled(bool checked);
|
||||
void updateInputFileUi();
|
||||
void inputFileComboBoxIndexChanged();
|
||||
void createManifestButton();
|
||||
void addAndroidExtraLib();
|
||||
void removeAndroidExtraLib();
|
||||
void checkEnableRemoveButton();
|
||||
|
||||
private:
|
||||
virtual QString summaryText() const;
|
||||
virtual QString displayName() const;
|
||||
void setCertificates();
|
||||
|
||||
Ui::AndroidDeployQtWidget *m_ui;
|
||||
AndroidDeployQtStep *m_step;
|
||||
AndroidExtraLibraryListModel *m_extraLibraryListModel;
|
||||
QmakeProjectManager::QmakeBuildConfiguration *m_currentBuildConfiguration;
|
||||
bool m_ignoreChange;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user