diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-05-18 14:37:11 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-05-22 07:33:15 +0000 |
| commit | dab2045099a4482296d5f46faff4e34f08e32f6a (patch) | |
| tree | b256f1572556506e0903d5ee637ccdccf2572305 /src | |
| parent | 0f7abe3737275e43b914ddfff3fa86ca8678fb20 (diff) | |
Android: Make sure we can queue AndroidDeviceInfo in connections
Change-Id: I7f59cba50e180ea4584442f8c2a409abb9e49a33
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/android/androidconfigurations.h | 1 | ||||
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/android/androidrunner.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 15d27413bd..58dde7479b 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -232,3 +232,4 @@ private: } // namespace Android +Q_DECLARE_METATYPE(Android::AndroidDeviceInfo) diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index b42c2df70c..4ea111aeb3 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -120,7 +120,8 @@ AndroidRunner::AndroidRunner(RunControl *runControl, setDisplayName("AndroidRunner"); static const int metaTypes[] = { qRegisterMetaType<QVector<QStringList> >("QVector<QStringList>"), - qRegisterMetaType<Utils::Port>("Utils::Port") + qRegisterMetaType<Utils::Port>("Utils::Port"), + qRegisterMetaType<AndroidDeviceInfo>("Android::AndroidDeviceInfo") }; Q_UNUSED(metaTypes); diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h index 3196df551a..c1cd170c68 100644 --- a/src/plugins/android/androidrunner.h +++ b/src/plugins/android/androidrunner.h @@ -66,7 +66,7 @@ signals: void asyncStart(); void asyncStop(); void qmlServerReady(const QUrl &serverUrl); - void androidDeviceInfoChanged(const AndroidDeviceInfo &deviceInfo); + void androidDeviceInfoChanged(const Android::AndroidDeviceInfo &deviceInfo); void avdDetected(); private: |