1 files changed, 20 insertions, 4 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
index 8e8b50f737..f57497069a 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -99,6 +99,7 @@ public class QtActivityDelegate
     private static final String APPLICATION_PARAMETERS_KEY = "application.parameters";
     private static final String STATIC_INIT_CLASSES_KEY = "static.init.classes";
     private static final String NECESSITAS_API_LEVEL_KEY = "necessitas.api.level";
+    private static final String EXTRACT_STYLE_KEY = "extract.android.style";
 
     private static String m_environmentVariables = null;
     private static String m_applicationParameters = null;
@@ -427,6 +428,11 @@ public class QtActivityDelegate
         if (null == m_mainLib && libraries.size() > 0)
             m_mainLib = libraries.get(libraries.size() - 1);
 
+        if (loaderParams.containsKey(EXTRACT_STYLE_KEY)) {
+            String path = loaderParams.getString(EXTRACT_STYLE_KEY);
+            new ExtractStyle(m_activity, path);
+        }
+
         try {
             m_super_dispatchKeyEvent = m_activity.getClass().getMethod("super_dispatchKeyEvent", KeyEvent.class);
             m_super_onRestoreInstanceState = m_activity.getClass().getMethod("super_onRestoreInstanceState", Bundle.class);
@@ -501,6 +507,9 @@ public class QtActivityDelegate
                         ? extras.getString("gdbserver_socket")
                         : "+debug-socket";
 
+                    if (!(new File(gdbserverPath)).exists())
+                        gdbserverPath += ".so";
+
                     // start debugger
                     m_debuggerProcess = Runtime.getRuntime().exec(gdbserverPath
                                                                     + socket
@@ -536,6 +545,11 @@ public class QtActivityDelegate
                     int timeOut = 30000; // ms until we give up on ping and pong
                     int maxAttempts = timeOut / napTime;
 
+                    if (gdbserverSocket != null) {
+                        debugLog("removing gdb socket " + gdbserverSocket);
+                        new File(gdbserverSocket).delete();
+                    }
+
                     if (usePing) {
                         debugLog("removing ping file " + pingFile);
                         File ping = new File(pingFile);
@@ -610,6 +624,8 @@ public class QtActivityDelegate
                             debugLog("go to sleep");
                             Thread.sleep(napTime);
                         }
+                        debugLog("Removing pingFile " + pingFile);
+                        new File(pingFile).delete();
 
                         if (i == maxAttempts) {
                             debugLog("time out when waiting for pong file");
@@ -888,7 +904,7 @@ public class QtActivityDelegate
         return false;
     }
 
-    private boolean m_opionsMenuIsVisible = false;
+    private boolean m_optionsMenuIsVisible = false;
     public boolean onCreateOptionsMenu(Menu menu)
     {
         menu.clear();
@@ -896,7 +912,7 @@ public class QtActivityDelegate
     }
     public boolean onPrepareOptionsMenu(Menu menu)
     {
-        m_opionsMenuIsVisible = true;
+        m_optionsMenuIsVisible = true;
         boolean res = QtNative.onPrepareOptionsMenu(menu);
         setActionBarVisibility(res && menu.size() > 0);
         return res;
@@ -909,7 +925,7 @@ public class QtActivityDelegate
 
     public void onOptionsMenuClosed(Menu menu)
     {
-        m_opionsMenuIsVisible = false;
+        m_optionsMenuIsVisible = false;
         QtNative.onOptionsMenuClosed(menu);
     }
 
@@ -923,7 +939,7 @@ public class QtActivityDelegate
             }
         }
         else
-            if (m_opionsMenuIsVisible)
+            if (m_optionsMenuIsVisible)
                 m_activity.closeOptionsMenu();
     }
     private boolean m_contextMenuVisible = false;