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

Use Utils::FilePath in SynchronousProcess

Browse Source 
Adapt callers and surrounding code.

Change-Id: Ie6c1883a44169cf9d790d06b660f46d24dc24c89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-06-06 16:27:55 +02:00
parent 021d3a6c59
commit ca4ba34229
48 changed files with 202 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/android/androidconfigurations.h
View File

@@ -139,7 +139,7 @@ public:
Utils::FilePath keytoolPath() const;
QVector<AndroidDeviceInfo> connectedDevices(QString *error = nullptr) const;
static QVector<AndroidDeviceInfo> connectedDevices(const QString &adbToolPath, QString *error = nullptr);
static QVector<AndroidDeviceInfo> connectedDevices(const Utils::FilePath &adbToolPath, QString *error = nullptr);
QString bestNdkPlatformMatch(int target) const;
@@ -156,14 +156,15 @@ public:
bool useNativeUiTools() const;
private:
static QString getDeviceProperty(const QString &adbToolPath, const QString &device, const QString &property);
static QString getDeviceProperty(const Utils::FilePath &adbToolPath,
const QString &device, const QString &property);
Utils::FilePath openJDKBinPath() const;
int getSDKVersion(const QString &device) const;
static int getSDKVersion(const QString &adbToolPath, const QString &device);
static int getSDKVersion(const Utils::FileName &adbToolPath, const QString &device);
QStringList getAbis(const QString &device) const;
static QStringList getAbis(const QString &adbToolPath, const QString &device);
static bool isBootToQt(const QString &adbToolPath, const QString &device);
static QStringList getAbis(const Utils::FilePath &adbToolPath, const QString &device);
static bool isBootToQt(const Utils::FilePath &adbToolPath, const QString &device);
bool isBootToQt(const QString &device) const;
static QString getAvdName(const QString &serialnumber);