fix deps of linked target, create QMainWindow

BUILD_ANDROID.md

@@ -44,7 +44,7 @@ make depend
 make all
 ```
 
-This should generate libcrypto and libssl in the root of the OpenSSL directory.
+This should generate libcrypto and libssl in the root of the OpenSSL directory. YOU MUST remove the `libssl.so` and `libcrypto.so` files that are generated. They are symlinks to `libssl.so.VER` and `libcrypto.so.VER` which Android does not know how to handle. By removing `libssl.so` and `libcrypto.so` the FindOpenSSL module will find the static libs and use those instead.
 
 If you have been building other components it is possible that the OpenSSL compile will fail based on the values other cross-compilations (tbb, bullet) have set. Ensure that you are in a new terminal window to avoid compilation errors from previously set environment variables.
 

cmake/android/QtCreateAPK.cmake

@@ -72,11 +72,23 @@ macro(qt_create_apk)
     else ()
       if(NOT _DEP MATCHES "Qt5::.*")
         get_property(_DEP_LOCATION TARGET ${_DEP} PROPERTY "LOCATION_${CMAKE_BUILD_TYPE}")
+        
+        # recurisvely add libraries which are dependencies of this target
+        get_property(_DEP_DEPENDENCIES TARGET ${_DEP} PROPERTY INTERFACE_LINK_LIBRARIES)
+      
+        foreach(_SUB_DEP IN LISTS _DEP_DEPENDENCIES)
+          if (NOT TARGET ${_SUB_DEP} AND NOT _SUB_DEP MATCHES "Qt5::.*")
+            list(APPEND _DEPS_LIST ${_SUB_DEP})
+          endif()
+        endforeach()
+        
         list(APPEND _DEPS_LIST ${_DEP_LOCATION})
       endif()
     endif ()
   endforeach()
   
+  list(REMOVE_DUPLICATES _DEPS_LIST)
+  
   # just copy static libs to apk libs folder - don't add to deps list
   foreach(_LOCATED_DEP IN LISTS _DEPS_LIST)
     if (_LOCATED_DEP MATCHES "\\.a$")

gvr-interface/CMakeLists.txt

@@ -6,7 +6,7 @@ set(ANDROID_APK_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/apk")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${ANDROID_APK_OUTPUT_DIR}/libs/${ANDROID_ABI}")
 set(BUILD_SHARED_LIBS ON)
 
-setup_hifi_library()
+setup_hifi_library(Gui Widgets)
 
 include_glm()
 

gvr-interface/src/GVRInterface.cpp

@@ -9,16 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <NodeList.h>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QMenuBar>
 
 #include "GVRInterface.h"
 
 GVRInterface::GVRInterface(int argc, char* argv[]) : 
-    QGuiApplication(argc, argv)
+    QApplication(argc, argv)
 {
-
-}
-
-void GVRInterface::processDatagrams() {
-
+    QMainWindow mainWindow;
+    mainWindow.menuBar()->addAction("Go to Address");
 }

gvr-interface/src/GVRInterface.h

@@ -12,14 +12,12 @@
 #ifndef hifi_GVRInterface_h
 #define hifi_GVRInterface_h
 
-#include <QtGui/qguiapplication.h>
+#include <QtWidgets/QApplication>
 
-class GVRInterface : public QGuiApplication {
+class GVRInterface : public QApplication {
     Q_OBJECT
 public:
     GVRInterface(int argc, char* argv[]);
-private slots:
-    void processDatagrams();
 };
 
 #endif // hifi_GVRInterface_h