diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-11-27 11:47:53 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-11-27 11:47:53 +0100 |
| commit | f9fb628ee3b52d5d4ebfef8b043ce818b5d2ec22 (patch) | |
| tree | dfae8789aca42f5acf8638e0a8e6bc31a3a5a5d8 /src/shared | |
| parent | b76c054961585e9716feb2ecdeed691b6cc9c267 (diff) | |
| parent | d7545f9bf5dc6fe77dc3f4b284880467c4e2087c (diff) | |
Merge remote-tracking branch 'origin/12.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
src/plugins/cppeditor/cppeditorwidget.cpp
Change-Id: I618826eaea8acfa65148bd191a0263454bf50e43
Diffstat (limited to 'src/shared')
| m--------- | src/shared/qbs | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 5ef68807776960c90d0572d51af36fc536bbe30 +Subproject 7867c6aaa375e6c7ff3affb67dc6af56df1ecdf |