Fix release builds debugging

Add gdbserver all the time, except when the user signs the package.
Even then the user can "Force debugging" by checking the checkbox.

Change-Id: I274243786f3d6d6b88f41e532bebc24213f5e9db
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 9 insertions, 7 deletions

diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
index c336329c9c..ce087ff9df 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
@@ -182,13 +182,6 @@ bool QmakeAndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
 
     QStringList argumentsPasswordConcealed = arguments;
 
-    if (version->qtVersion() >= QtSupport::QtVersionNumber(5, 6, 0)) {
-        if (bc->buildType() == ProjectExplorer::BuildConfiguration::Debug)
-            arguments << QLatin1String("--gdbserver");
-        else
-            arguments << QLatin1String("--no-gdbserver");
-    }
-
     if (m_signPackage) {
         arguments << QLatin1String("--sign")
                   << m_keystorePath.toString()
@@ -206,6 +199,15 @@ bool QmakeAndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
 
     }
 
+    // Must be the last option, otherwise androiddeployqt might use the other
+    // params (e.g. --sign) to choose not to add gdbserver
+    if (version->qtVersion() >= QtSupport::QtVersionNumber(5, 6, 0)) {
+        if (m_addDebugger || bc->buildType() == ProjectExplorer::BuildConfiguration::Debug)
+            arguments << QLatin1String("--gdbserver");
+        else
+            arguments << QLatin1String("--no-gdbserver");
+    }
+
     ProjectExplorer::ProcessParameters *pp = processParameters();
     setupProcessParameters(pp, bc, arguments, command);