feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertychangesmodel.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertymodel.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.h

Change-Id: Ib029a830ee99190bc4ea2ad75d9300bfa86b42d9
This commit is contained in:
Tim Jenssen
2022-10-25 19:01:00 +02:00
parent 13f40f5471 0944bfb7f0
commit aa33927651
186 changed files with 2027 additions and 1207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androiddebugsupport.cpp
View File

@@ -136,7 +136,14 @@ void AndroidDebugSupport::start()
setAbi(AndroidManager::androidAbi2Abi(devicePreferredAbi));
if (cppEngineType() == LldbEngineType) {
setRemoteChannel("adb://" + AndroidManager::deviceSerialNumber(target),
QString deviceSerialNumber = AndroidManager::deviceSerialNumber(target);
const int colonPos = deviceSerialNumber.indexOf(QLatin1Char(':'));
if (colonPos > 0) {
// When wireless debugging is used then the device serial number will include a port number
// The port number must be removed to form a valid hostname
deviceSerialNumber.truncate(colonPos);
}
setRemoteChannel("adb://" + deviceSerialNumber,
m_runner->debugServerPort().number());
} else {
QUrl debugServer;