diff options
| author | Eike Ziller <[email protected]> | 2014-08-15 14:42:30 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2014-08-15 16:14:34 +0200 |
| commit | d9d0aba1c4870eaddd9ec3be1561ed0a39bcc74d (patch) | |
| tree | d2d40ffee8d17ae3193064d861894a5661908dd0 /src/plugins/android/androidrunner.cpp | |
| parent | 23536e9b426aba67880a9ef19e9c67517e642df0 (diff) | |
| parent | 8c133689be164cfdb8f77078a97dce3c97397afe (diff) | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/projectexplorer/editorconfiguration.cpp
src/plugins/projectexplorer/projectfilewizardextension.cpp
src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp
Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 51c9af54a3c..e484e0e0945 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -37,8 +37,10 @@ #include <debugger/debuggerrunconfigurationaspect.h> #include <projectexplorer/target.h> +#include <qtsupport/qtkitinformation.h> #include <utils/qtcassert.h> +#include <QDir> #include <QTime> #include <QtConcurrentRun> #include <QTemporaryFile> @@ -93,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; @@ -292,7 +298,7 @@ void AndroidRunner::asyncStart() // Handling ping. for (int i = 0; ; ++i) { - QTemporaryFile tmp(_("pingpong")); + QTemporaryFile tmp(QDir::tempPath() + _("/pingpong")); tmp.open(); tmp.close(); @@ -324,7 +330,7 @@ void AndroidRunner::asyncStart() void AndroidRunner::handleRemoteDebuggerRunning() { if (m_useCppDebugger) { - QTemporaryFile tmp(_("pingpong")); + QTemporaryFile tmp(QDir::tempPath() + _("/pingpong")); tmp.open(); QProcess process; |