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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic02df53b880d0861d9d9ea0df3e0d381ae99f350
This commit is contained in:
Eike Ziller
2022-03-11 09:50:48 +01:00
parent a863958aa4 2829412e15
commit cd8c4ced81
184 changed files with 3566 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/debuggersourcepathmappingwidget.cpp
View File

@@ -100,7 +100,8 @@ QStringList qtBuildPaths()
return {"Q:/qt5_workdir/w/s",
"C:/work/build/qt5_workdir/w/s",
"c:/users/qt/work/qt",
"c:/Users/qt/work/install"};
"c:/Users/qt/work/install",
"/Users/qt/work/qt"};
} else if (HostOsInfo::isMacHost()) {
return { "/Users/qt/work/qt" };
} else {