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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdbsettings.cpp
	src/plugins/perfprofiler/perfprofilerruncontrol.cpp

Change-Id: I0d5b914f9d9b5499920a5db484ef77af6ae748d5
This commit is contained in:
Eike Ziller
2024-03-12 09:27:39 +01:00
parent 8c5c849b71 9934a9cafa
commit 1b97fdc100
77 changed files with 3193 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidconfigurations.cpp
View File

@@ -1470,8 +1470,7 @@ void AndroidConfigurations::updateAutomaticKitList()
}
// cleanup any mess that might have existed before, by removing all Android kits that
// existed before, but weren't re-used
for (Kit *k : unhandledKits)
KitManager::deregisterKit(k);
KitManager::deregisterKits(unhandledKits);
}
Environment AndroidConfig::toolsEnvironment() const