diff options
| author | BogDan Vatra <[email protected]> | 2014-08-07 10:10:32 +0300 |
|---|---|---|
| committer | Daniel Teske <[email protected]> | 2014-08-08 17:37:28 +0200 |
| commit | d7760f19a2dc10ff4feec4e6e07476ad96115d2b (patch) | |
| tree | 95646487e3044bdd163ec3ce357503f8d178c633 /src/plugins/android/androidrunner.cpp | |
| parent | e0abca4be7737114eb65ffe6d37000b0800cebd3 (diff) | |
Android: Use the new gdbserver name for Qt 5.4+
Starting with Qt 5.4 we are packaging the gdbserver tool as gdbserver.so,
otherwise gradle will refuse to add it to the package. Gdbserver is renamed
also for ant.
Change-Id: I6da3ad54de591c124fe56d5464e74099dfd901a1
Reviewed-by: Daniel Teske <[email protected]>
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 4958b1be8d4..d1e33b2b646 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -38,6 +38,7 @@ #include <debugger/debuggerrunconfigurationaspect.h> #include <projectexplorer/target.h> +#include <qtsupport/qtkitinformation.h> #include <utils/qtcassert.h> #include <QTime> @@ -94,6 +95,10 @@ AndroidRunner::AndroidRunner(QObject *parent, m_pongFile = _("/data/local/tmp/qt/debug-pong-") + m_packageName; m_gdbserverSocket = packageDir + _("/debug-socket"); m_gdbserverPath = packageDir + _("/lib/gdbserver"); + const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit()); + if (version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0)) + m_gdbserverPath += _(".so"); + m_gdbserverCommand = m_gdbserverPath + _(" --multi +") + m_gdbserverSocket; // Detect busybox, as we need to pass -w to ps to get wide output. QProcess psProc; |