diff options
| author | Eike Ziller <[email protected]> | 2014-08-19 12:34:54 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2014-08-19 12:34:58 +0200 |
| commit | c4e51e7405200272fd349dc18d16f911bdc34f06 (patch) | |
| tree | 82978d02a8bb4f15dbe662947cd2c1387740ca43 /src/plugins/android/androidrunner.cpp | |
| parent | c5fae0e8dac0a5a5466d8cc3bb0bc81ce2d625b8 (diff) | |
| parent | 507ad11f945b0320fcbce7cac465f0226ba73199 (diff) | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I926bdfc7df6158207cfc07f3c6c591d0a59b7667
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index e484e0e0945..af4928ca73d 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -94,10 +94,12 @@ AndroidRunner::AndroidRunner(QObject *parent, m_pingFile = packageDir + _("/debug-ping"); 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_gdbserverPath = packageDir + _("/lib/libgdbserver.so"); + else + m_gdbserverPath = packageDir + _("/lib/gdbserver"); + m_gdbserverCommand = m_gdbserverPath + _(" --multi +") + m_gdbserverSocket; // Detect busybox, as we need to pass -w to ps to get wide output. |