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

Use androiddeployqt to install the package when using Qt >= 5.4

Browse Source 
On Qt < 5.4 androiddeployqt can't be used to only install the package
(and qt libs if the debug deployment was chose).

Change-Id: Ia7939e7988163ec04bdc7a927fd3a89e4d824782
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2014-08-08 20:03:47 +03:00
parent d7449a0097
commit 85fff52937
6 changed files with 121 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@
#ifndef ANDROIDDEPLOYQTSTEP_H
#define ANDROIDDEPLOYQTSTEP_H
#include "androidbuildapkstep.h"
#include "androidconfigurations.h"
#include <projectexplorer/abstractprocessstep.h>
@@ -108,6 +109,9 @@ private:
bool m_uninstallPreviousPackageRun;
static const Core::Id Id;
bool m_installOk;
bool m_useAndroiddeployqt;
AndroidBuildApkStep::AndroidDeployAction m_deployAction;
QString m_androiddeployqtArgs;
};
}