diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2018-12-03 11:25:49 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-12-03 12:39:29 +0000 |
| commit | d51ddbb8f0ca819b204bddf55658ca62d3cce9b4 (patch) | |
| tree | a91007fda774d9dbff46af858a2a31a51fc21618 | |
| parent | 8920d78bb298d96674d31ab6af7d22b904f9e69e (diff) | |
[Android] Fix qml debugging for Qt 5.12v4.8.0
Since Qt 5.12.0 we don't use qmljsdebugger extra intent param anymore
and we need to pass qmljsdebugger to the application arguments.
Fixes: QTBUG-72132
Change-Id: Icefb75e94027b145832c114fd90579bd10bcb898
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/android/androidrunnerworker.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/android/androidrunnerworker.h | 1 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 8da140ab62..a4b6772f61 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -225,6 +225,8 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa << "Before Start ADB cmds:" << m_beforeStartAdbCommands << "After finish ADB cmds:" << m_afterFinishAdbCommands; m_gdbserverPath = AndroidGdbServerKitInformation::gdbServer(target->kit()).toString(); + QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit()); + m_useAppParamsForQmlDebugger = version->qtVersion() >= QtSupport::QtVersionNumber(5, 12); } AndroidRunnerWorker::~AndroidRunnerWorker() @@ -483,10 +485,18 @@ void AndroidRunnerWorker::asyncStartHelper() } m_afterFinishAdbCommands.push_back(removeForward.join(' ')); - args << "-e" << "qml_debug" << "true" - << "-e" << "qmljsdebugger" - << QString("port:%1,block,services:%2") + const QString qmljsdebugger = QString("port:%1,block,services:%2") .arg(m_qmlServer.port()).arg(QmlDebug::qmlDebugServices(m_qmlDebugServices)); + + if (m_useAppParamsForQmlDebugger) { + if (!m_extraAppParams.isEmpty()) + m_extraAppParams.prepend(' '); + m_extraAppParams.prepend("-qmljsdebugger=" + qmljsdebugger); + } else { + args << "-e" << "qml_debug" << "true" + << "-e" << "qmljsdebugger" + << qmljsdebugger; + } } diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h index ee5ec87287..18639683ae 100644 --- a/src/plugins/android/androidrunnerworker.h +++ b/src/plugins/android/androidrunnerworker.h @@ -112,6 +112,7 @@ protected: QString m_extraAppParams; Utils::Environment m_extraEnvVars; QString m_gdbserverPath; + bool m_useAppParamsForQmlDebugger = false; }; } // namespace Internal |