Android debugging compatibility fix for Creator 3.1

Make debugging work with both Qt Creator 3.1 and the upcoming 3.2.

Change-Id: I0d13d353fe560aee0c0103959d9619f14786ba57
Reviewed-by: BogDan Vatra <bogdan@kde.org>

diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index ca5d7e3..e3ed5c2 100644 (file)
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -2687,12 +2687,14 @@ bool copyGdbServer(const Options &options)
         return false;
     }
 
+    QString gdbServerTarget = options.outputDirectory + QLatin1String("/libs/") + options.architecture;
+
     if (!copyFileIfNewer(gdbServerBinary,
-                         options.outputDirectory
-                            + QLatin1String("/libs/")
-                            + options.architecture
-                            + QLatin1String("/gdbserver.so"),
-                         options.verbose)) {
+                         gdbServerTarget + QLatin1String("/gdbserver"),
+                         options.verbose)
+        || !copyFileIfNewer(gdbServerBinary,
+                            gdbServerTarget + QLatin1String("/libgdbserver.so"),
+                            options.verbose)) {
         return false;
     }