diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-15 09:57:01 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-15 09:03:54 +0000 |
| commit | 5a77234898de9374cde7569b839e07db8a319c37 (patch) | |
| tree | 5daaf1a9c943d7e467fe00663c5abdde0698bef0 /src/android/app | |
| parent | af3df98332991446c6d8329ad47df34d7b1abea1 (diff) | |
Rename .java files
Change-Id: I6d7e324e746d9ea934d6630cc865adaa08c4cc3c
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/android/app')
| -rw-r--r-- | src/android/app/qnativeandroidactivity.cpp | 2 | ||||
| -rw-r--r-- | src/android/app/qnativeandroidservice.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/android/app/qnativeandroidactivity.cpp b/src/android/app/qnativeandroidactivity.cpp index 4208b2a..6412158 100644 --- a/src/android/app/qnativeandroidactivity.cpp +++ b/src/android/app/qnativeandroidactivity.cpp @@ -175,7 +175,7 @@ void QNativeAndroidActivity::updateOptionsMenu() QAndroidJniObject activity = instance(); QtQmlAndroid::callFunction([=]() { - activity.callMethod<void>("setOptionsMenu", "(Lqt/android/view/QmlMenu;)V", menu.object()); + activity.callMethod<void>("setOptionsMenu", "(Lqt/android/view/QtNativeMenu;)V", menu.object()); }); } diff --git a/src/android/app/qnativeandroidservice.cpp b/src/android/app/qnativeandroidservice.cpp index ccb0d49..5c5e9a9 100644 --- a/src/android/app/qnativeandroidservice.cpp +++ b/src/android/app/qnativeandroidservice.cpp @@ -73,7 +73,7 @@ void QNativeAndroidService::start() cls.object()); intent.callObjectMethod("putExtra", "(Ljava/lang/String;J)Landroid/content/Intent;", - QAndroidJniObject::fromString(QStringLiteral("QmlService")).object(), + QAndroidJniObject::fromString(QStringLiteral("QtNativeService")).object(), reinterpret_cast<jlong>(this)); QAndroidJniObject component = context.callObjectMethod("startService", "(Landroid/content/Intent;)Landroid/content/ComponentName;", @@ -98,7 +98,7 @@ void QNativeAndroidService::stop() cls.object()); intent.callObjectMethod("putExtra", "(Ljava/lang/String;J)Landroid/content/Intent;", - QAndroidJniObject::fromString(QStringLiteral("QmlService")).object(), + QAndroidJniObject::fromString(QStringLiteral("QtNativeService")).object(), reinterpret_cast<jlong>(this)); context.callMethod<jboolean>("stopService", "(Landroid/content/Intent;)Z", @@ -108,7 +108,7 @@ void QNativeAndroidService::stop() QAndroidJniObject QNativeAndroidService::onCreate() { - return QAndroidJniObject("qt/android/app/QmlService"); + return QAndroidJniObject("qt/android/app/QtNativeService"); } void QNativeAndroidService::onInflate(QAndroidJniObject& instance) |