From 60da4c85f8cec926272d59069b0232fdb27855ce Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 13 Aug 2014 14:32:51 +0200 Subject: [PATCH] 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 --- src/androiddeployqt/main.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index ca5d7e3..e3ed5c2 100644 --- 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; } -- 2.7.4