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

Android: Make sure we can queue AndroidDeviceInfo in connections

Browse Source 
Change-Id: I7f59cba50e180ea4584442f8c2a409abb9e49a33
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Ulf Hermann
2018-05-18 14:37:11 +02:00
parent 0f7abe3737
commit dab2045099
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,3 +232,4 @@ private:
} // namespace Android } // namespace Android
Q_DECLARE_METATYPE(Android::AndroidDeviceInfo)

3
src/plugins/android/androidrunner.cpp
View File

@@ -120,7 +120,8 @@ AndroidRunner::AndroidRunner(RunControl *runControl,
setDisplayName("AndroidRunner"); setDisplayName("AndroidRunner");
static const int metaTypes[] = { static const int metaTypes[] = {
qRegisterMetaType<QVector<QStringList> >("QVector<QStringList>"), qRegisterMetaType<QVector<QStringList> >("QVector<QStringList>"),
qRegisterMetaType<Utils::Port>("Utils::Port") qRegisterMetaType<Utils::Port>("Utils::Port"),
qRegisterMetaType<AndroidDeviceInfo>("Android::AndroidDeviceInfo")
}; };
Q_UNUSED(metaTypes); Q_UNUSED(metaTypes);

2
src/plugins/android/androidrunner.h
View File

@@ -66,7 +66,7 @@ signals:
void asyncStart(); void asyncStart();
void asyncStop(); void asyncStop();
void qmlServerReady(const QUrl &serverUrl); void qmlServerReady(const QUrl &serverUrl);
void androidDeviceInfoChanged(const AndroidDeviceInfo &deviceInfo); void androidDeviceInfoChanged(const Android::AndroidDeviceInfo &deviceInfo);
void avdDetected(); void avdDetected();
private: private: