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

Merge remote-tracking branch 'origin/14.0'

Browse Source 
Conflicts:
	src/plugins/android/androidmanager.cpp
	src/plugins/android/androidrunner.cpp
	src/plugins/android/androidrunner.h
	src/plugins/qmldesigner/components/texteditor/texteditorview.cpp
	src/plugins/qmldesigner/components/texteditor/texteditorview.h
	src/plugins/qmldesigner/designmodecontext.cpp
	src/plugins/qmldesigner/designmodecontext.h
	src/plugins/qmljseditor/qmljseditingsettingspage.cpp

Change-Id: Idada49bb7441e8c5b748bd75b2e6bb2351bd323e
This commit is contained in:
Eike Ziller
2024-07-25 12:56:53 +02:00
parent 319e87fd6c 8758c3c8dd
commit 3bbfd66bad
49 changed files with 2465 additions and 1395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -1168,6 +1168,10 @@ Kit *CMakeProjectImporter::createKit(void *directoryData) const
if (!cmtcd.originalTargetTriple.isEmpty())
toolchain->setExplicitCodeModelTargetTriple(cmtcd.originalTargetTriple);
// Mark CMake presets toolchains as manual
if (!data->cmakePresetDisplayname.isEmpty() && tcd.areTemporary)
toolchain->setDetection(Toolchain::ManualDetection);
ToolchainKitAspect::setToolchain(k, toolchain);
}