diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-11-13 12:56:36 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-11-17 12:11:42 +0000 |
| commit | 8d936b8aa6eb1cc7318e90bd96b7961655865b18 (patch) | |
| tree | 8314522661b15d6183dbe3ed4ebf09f8d68a9b56 /src/plugins/android/androiddeployqtstep.h | |
| parent | f996f05b0f43029614da74046a3d3358824623e5 (diff) | |
| download | qt-creator-8d936b8aa6eb1cc7318e90bd96b7961655865b18.tar.gz | |
AndroidDeployQtStep: Keep data requested from user around
Reuse the data for the following AndroidDeployQtSteps that
are in the same batch submitted to the BuildManager.
This should fix Qt Creator asking for the device multiple times
when building projects that depend on other projects.
Task-number: QTCREATORBUG-15338
Change-Id: I4fbb04d4d8e492f6a766461bca3e6f9683824def
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Diffstat (limited to 'src/plugins/android/androiddeployqtstep.h')
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h index 04fa83138e..d7a36e8e12 100644 --- a/src/plugins/android/androiddeployqtstep.h +++ b/src/plugins/android/androiddeployqtstep.h @@ -90,6 +90,8 @@ public: UninstallType uninstallPreviousPackage(); + AndroidDeviceInfo deviceInfo() const; + public slots: void setUninstallPreviousPackage(bool uninstall); @@ -141,6 +143,7 @@ private: QString m_workingDirectory; Utils::Environment m_environment; Utils::QtcProcess *m_process; + AndroidDeviceInfo m_deviceInfo; }; } |