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

Make sure apps that are using Qt < 5.4 are really uninstalled.

Browse Source 
Change-Id: I313b7a991fcc7adc7b9da85dbebc6dcd65b78ced
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2014-10-03 10:18:14 +03:00
parent 4fc5eeb97b
commit 80040491b0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,7 @@ AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent,
void AndroidDeployQtStep::ctor() void AndroidDeployQtStep::ctor()
{ {
m_uninstallPreviousPackage = false; m_uninstallPreviousPackage = QtSupport::QtKitInformation::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0);
m_uninstallPreviousPackageTemp = false; m_uninstallPreviousPackageTemp = false;
m_uninstallPreviousPackageRun = false; m_uninstallPreviousPackageRun = false;
@@ -387,7 +387,7 @@ bool AndroidDeployQtStep::processSucceeded(int exitCode, QProcess::ExitStatus st
bool AndroidDeployQtStep::fromMap(const QVariantMap &map) bool AndroidDeployQtStep::fromMap(const QVariantMap &map)
{ {
m_uninstallPreviousPackage = map.value(UninstallPreviousPackageKey, false).toBool(); m_uninstallPreviousPackage = map.value(UninstallPreviousPackageKey, m_uninstallPreviousPackage).toBool();
return ProjectExplorer::BuildStep::fromMap(map); return ProjectExplorer::BuildStep::fromMap(map);
} }