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

Force uninstall of any Qt apps that are using Qt < 5.4

Browse Source 
On Qt 5.4 the problem was fixed by
https://codereview.qt-project.org/#/c/91261/

Change-Id: Id139fe2fe1e83ac5108ffeeb140cb8d2f16747c7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2014-09-16 14:25:34 +03:00
parent 41942ac088
commit 8bb83b514f
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -253,6 +253,7 @@ bool AndroidDeployQtStep::init()
break; break;
} }
} else { } else {
m_uninstallPreviousPackageRun = true;
pp->setCommand(AndroidConfigurations::currentConfig().adbToolPath().toString()); pp->setCommand(AndroidConfigurations::currentConfig().adbToolPath().toString());
m_apkPath = AndroidManager::androidQtSupport(target())->apkPath(target(), AndroidManager::signPackage(target()) m_apkPath = AndroidManager::androidQtSupport(target())->apkPath(target(), AndroidManager::signPackage(target())
? AndroidQtSupport::ReleaseBuildSigned ? AndroidQtSupport::ReleaseBuildSigned
@@ -404,7 +405,9 @@ bool AndroidDeployQtStep::runInGuiThread() const
return true; return true;
} }
bool AndroidDeployQtStep::uninstallPreviousPackage() AndroidDeployQtStep::UninstallType AndroidDeployQtStep::uninstallPreviousPackage()
{ {
return m_uninstallPreviousPackage; if (QtSupport::QtKitInformation::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0))
return ForceUnintall;
return m_uninstallPreviousPackage ? Uninstall : Keep;
} }

8
src/plugins/android/androiddeployqtstep.h
View File

@@ -69,6 +69,12 @@ class AndroidDeployQtStep : public ProjectExplorer::AbstractProcessStep
{ {
Q_OBJECT Q_OBJECT
friend class AndroidDeployQtStepFactory; friend class AndroidDeployQtStepFactory;
public:
enum UninstallType {
Keep,
Uninstall,
ForceUnintall
};
public: public:
AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc); AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc);
@@ -77,7 +83,7 @@ public:
bool runInGuiThread() const; bool runInGuiThread() const;
bool uninstallPreviousPackage(); UninstallType uninstallPreviousPackage();
public slots: public slots:
void setUninstallPreviousPackage(bool uninstall); void setUninstallPreviousPackage(bool uninstall);

3
src/plugins/android/androiddeployqtwidget.cpp
View File

@@ -46,7 +46,8 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
m_ui->uninstallPreviousPackage->setChecked(m_step->uninstallPreviousPackage()); m_ui->uninstallPreviousPackage->setChecked(m_step->uninstallPreviousPackage() > AndroidDeployQtStep::Keep);
m_ui->uninstallPreviousPackage->setEnabled(m_step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall);
connect(m_ui->installMinistroButton, SIGNAL(clicked()), SLOT(installMinistro())); connect(m_ui->installMinistroButton, SIGNAL(clicked()), SLOT(installMinistro()));
connect(m_ui->cleanLibsPushButton, SIGNAL(clicked()), SLOT(cleanLibsOnDevice())); connect(m_ui->cleanLibsPushButton, SIGNAL(clicked()), SLOT(cleanLibsOnDevice()));
connect(m_ui->resetDefaultDevices, SIGNAL(clicked()), SLOT(resetDefaultDevices())); connect(m_ui->resetDefaultDevices, SIGNAL(clicked()), SLOT(resetDefaultDevices()));