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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	src/plugins/clangtools/clangtoolssettings.cpp
	src/plugins/clangtools/executableinfo.cpp
	src/plugins/clangtools/executableinfo.h

Change-Id: Id8caf63e3e594792467d3447870086bd2d8f73b9
This commit is contained in:
Eike Ziller
2021-09-13 15:36:51 +02:00
parent c941f7d0f5 7e965629b0
commit 3d4d7c7e14
98 changed files with 1321 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprofiler/CMakeLists.txt
View File

@@ -106,6 +106,8 @@ else() # < Qt 6.2
BATCHABLE
PREFIX
"/QtCreator/QmlProfiler"
BASE
"qml"
FILES
qml/bindingloops_qt6.frag
qml/bindingloops_qt6.vert