diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-07-03 17:58:48 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-07-08 11:47:02 +0200 |
| commit | 7517a3408a51929dbafafb9df09ab7e502cfc7bd (patch) | |
| tree | e8010d62ed1ebaf7632e7fac41412753fa8db8fa /src/plugins/android/androidconfigurations.h | |
| parent | 514ba53b3585c20db19ef4d9b841deaf597fac33 (diff) | |
| download | qt-creator-7517a3408a51929dbafafb9df09ab7e502cfc7bd.tar.gz | |
Android: Show more information in the compile output for devices
Task-number: QTCREATORBUG-9690
Change-Id: I9b3e20db9049edc42364b005a7920a040f3feaf7
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/android/androidconfigurations.h')
| -rw-r--r-- | src/plugins/android/androidconfigurations.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 0fae8c711a..0531e323ab 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -92,10 +92,10 @@ public: Utils::FileName zipalignPath() const; Utils::FileName stripPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const; Utils::FileName readelfPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const; - QString getDeployDeviceSerialNumber(int *apiLevel, const QString &abi) const; + QString getDeployDeviceSerialNumber(int *apiLevel, const QString &abi, QString *error = 0) const; bool createAVD(const QString &target, const QString &name, int sdcardSize) const; bool removeAVD(const QString &name) const; - QVector<AndroidDeviceInfo> connectedDevices() const; + QVector<AndroidDeviceInfo> connectedDevices(QString *error = 0) const; QVector<AndroidDeviceInfo> androidVirtualDevices() const; QString startAVD(int *apiLevel, const QString &name = QString()) const; QString bestMatch(const QString &targetAPI) const; @@ -109,6 +109,8 @@ public: // called from AndroidPlugin void updateAndroidDevice(); + QString getProductModel(const QString &device) const; + signals: void updated(); |