diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-09-22 12:04:15 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-09-25 13:52:49 +0000 |
| commit | 9d162bdb16b3764e8b9633fa1c2980900d0f3501 (patch) | |
| tree | 6ac4c9a08225861de1ed80f6a179aca03bf73899 | |
| parent | 283b2f1c12140eb6432ee84f3bf45e4015524227 (diff) | |
| download | qt-creator-9d162bdb16b3764e8b9633fa1c2980900d0f3501.tar.gz | |
Android: Be explicit on whether gdbserver should be added to the package
Change-Id: I2a03e243678263441d64884dbd5245b8ec2ba9c7
Task-number: QTCREATORBUG-13035
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -rw-r--r-- | src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp index c08eb6d023..96d16bc5a3 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp @@ -234,6 +234,13 @@ bool QmakeAndroidBuildApkStep::init() QStringList argumentsPasswordConcealed = arguments; + if (version->qtVersion() >= QtSupport::QtVersionNumber(5, 6, 0)) { + if (bc->buildType() == ProjectExplorer::BuildConfiguration::Debug) + arguments << QLatin1String("--gdbserver"); + else + arguments << QLatin1String("--no-gdbserver"); + } + if (m_signPackage) { arguments << QLatin1String("--sign") << m_keystorePath.toString() |