From c0b61e4c38bb60fb039c945d53d4fbe1920a99bd Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 27 Jan 2015 11:38:38 -0800
Subject: [PATCH] register GVR receivers with QtActivity

---
 cmake/android/AndroidManifest.xml.in | 2 +-
 gvr-interface/CMakeLists.txt         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmake/android/AndroidManifest.xml.in b/cmake/android/AndroidManifest.xml.in
index 9f29411590..354da4fbc1 100755
--- a/cmake/android/AndroidManifest.xml.in
+++ b/cmake/android/AndroidManifest.xml.in
@@ -9,7 +9,7 @@
     <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_dual"/>
     
     <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
-              android:name="${ANDROID_ACTIVITY_NAME}"
+              android:name="org.qtproject.qt5.android.bindings.QtActivity"
               android:label="@string/AppDisplayName"
               android:screenOrientation="landscape"
               android:launchMode="singleTop"
diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index ca3ac45b4c..8c14d59798 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@@ -19,7 +19,6 @@ set(ANDROID_SDK_ROOT $ENV{ANDROID_HOME})
 set(ANDROID_APP_DISPLAY_NAME Interface)
 set(ANDROID_API_LEVEL 19)
 set(ANDROID_APK_PACKAGE io.highfidelity.gvrinterface)
-set(ANDROID_ACTIVITY_NAME io.highfidelity.gvrinterface.GVRActivity)
 
 find_package(LibOVR REQUIRED)
 target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES} ${LIBOVR_ANDROID_LIBRARIES})