From 9fd6fe49a49977f98db11899c1d2661973da81cc Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 18 Nov 2014 12:09:57 -0800 Subject: [PATCH] fix leftover method define, make apk creation a sep target --- cmake/android/QtCreateAPK.cmake | 3 ++- gvr-interface/src/GVRInterface.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/android/QtCreateAPK.cmake b/cmake/android/QtCreateAPK.cmake index a22bfc33dc..c631dca795 100644 --- a/cmake/android/QtCreateAPK.cmake +++ b/cmake/android/QtCreateAPK.cmake @@ -76,7 +76,8 @@ macro(qt_create_apk) configure_file("${ANDROID_THIS_DIRECTORY}/deployment-file.json.in" "${TARGET_NAME}-deployment.json") # use androiddeployqt to create the apk - add_custom_command(TARGET ${TARGET_NAME} + add_custom_target(${TARGET_NAME}-apk COMMAND ${ANDROID_DEPLOY_QT} --input "${TARGET_NAME}-deployment.json" --output "${ANDROID_APK_OUTPUT_DIR}" --android-platform android-${ANDROID_API_LEVEL} --install --deployment bundled "\\$(ARGS)" + DEPENDS ${TARGET_NAME} ) endmacro() \ No newline at end of file diff --git a/gvr-interface/src/GVRInterface.h b/gvr-interface/src/GVRInterface.h index b318dabedd..af7f46f933 100644 --- a/gvr-interface/src/GVRInterface.h +++ b/gvr-interface/src/GVRInterface.h @@ -18,8 +18,6 @@ class GVRInterface : public QGuiApplication { Q_OBJECT public: GVRInterface(int argc, char* argv[]); -private slots: - void processDatagrams(); }; #endif // hifi_GVRInterface_h