2 files changed, 8 insertions, 4 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java
index 887602a037..1b2e8e49a0 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java
@@ -136,7 +136,7 @@ class QtActivityLoader extends QtLoader {
                 appendApplicationParameters(getDecodedUtfString(extraAppParams));
             }
 
-            m_debuggerSleepMs = 1000;
+            m_debuggerSleepMs = 3000;
             if (Os.getenv("QT_ANDROID_DEBUGGER_MAIN_THREAD_SLEEP_MS") != null) {
                 try {
                    m_debuggerSleepMs = Integer.parseInt(Os.getenv("QT_ANDROID_DEBUGGER_MAIN_THREAD_SLEEP_MS"));
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtLoader.java
index 07a78dd343..eb27bdc590 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtLoader.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtLoader.java
@@ -435,6 +435,13 @@ abstract class QtLoader {
         ArrayList<String> nativeLibraries = getQtLibrariesList();
         nativeLibraries.addAll(getLocalLibrariesList());
 
+        if (m_debuggerSleepMs > 0) {
+            Log.i(QtTAG, "Sleeping for " + m_debuggerSleepMs +
+                         "ms, helping the native debugger to settle. " +
+                         "Use the env QT_ANDROID_DEBUGGER_MAIN_THREAD_SLEEP_MS variable to change this value.");
+            QtNative.getQtThread().sleep(m_debuggerSleepMs);
+        }
+
         if (!loadLibraries(nativeLibraries)) {
             Log.e(QtTAG, "Loading Qt native libraries failed");
             finish();
@@ -511,9 +518,6 @@ abstract class QtLoader {
         String mainLibPath = getLibrariesFullPaths(oneEntryArray).get(0);
         final boolean[] success = {true};
         QtNative.getQtThread().run(() -> {
-            if (m_debuggerSleepMs > 0)
-                QtNative.getQtThread().sleep(m_debuggerSleepMs);
-
             m_mainLibPath = loadLibraryHelper(mainLibPath);
             if (m_mainLibPath == null)
                 success[0] = false;