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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/android/androiddebugsupport.cpp

Change-Id: I01c4880850ad25432a65bb32849365d2aeb0756f
This commit is contained in:
Eike Ziller
2018-07-10 07:44:53 +02:00
parent d20464d56f 3300182d40
commit d09b71d260
31 changed files with 369 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androidmanager.h
View File

@@ -29,6 +29,7 @@
#include <QPair>
#include <QObject>
#include <QVersionNumber>
namespace ProjectExplorer {
class Kit;
@@ -48,7 +49,12 @@ class ANDROID_EXPORT AndroidManager : public QObject
public:
static QString packageName(ProjectExplorer::Target *target);
static QString packageName(const Utils::FileName &manifestFile);
static bool packageInstalled(const QString &deviceSerial,
const QString &packageName);
static void apkInfo(const Utils::FileName &apkPath,
QString *packageName = nullptr,
QVersionNumber *version = nullptr,
QString *activityPath = nullptr);
static QString intentName(ProjectExplorer::Target *target);
static QString activityName(ProjectExplorer::Target *target);
@@ -86,6 +92,10 @@ public:
static AndroidQtSupport *androidQtSupport(ProjectExplorer::Target *target);
static bool updateGradleProperties(ProjectExplorer::Target *target);
static int findApiLevel(const Utils::FileName &platformPath);
static void runAdbCommandDetached(const QStringList &args);
static bool runAdbCommand(const QStringList &args, QString *output = nullptr);
static bool runAaptCommand(const QStringList &args, QString *output = nullptr);
};
} // namespace Android