diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-22 16:12:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 16:12:53 +0100 |
| commit | 0b250dd628dfd93f4f1077f066976dfab4d9d0fb (patch) | |
| tree | 320571d840f9d59420d4fe684079a0228c22e49c /src/plugins/platforms/android/src/androidjnimain.h | |
| parent | ef288db325d3c115e0cf5f458c657bdee60a432f (diff) | |
| parent | f3bf2efcbd4759dd7be96d9a3fc4719f01d472ba (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/plugins/platforms/android/src/androidjnimain.h')
| -rw-r--r-- | src/plugins/platforms/android/src/androidjnimain.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/src/androidjnimain.h b/src/plugins/platforms/android/src/androidjnimain.h index 11d3573404..a7b7072ba3 100644 --- a/src/plugins/platforms/android/src/androidjnimain.h +++ b/src/plugins/platforms/android/src/androidjnimain.h @@ -120,5 +120,6 @@ namespace QtAndroid const char *methodErrorMsgFmt(); const char *qtTagText(); + QString deviceName(); } #endif // ANDROID_APP_H |