diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-03-29 12:21:50 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-03-29 12:21:50 +0200 |
| commit | b36287731eb8ab3895a1e7e19f071009dd1c1ad4 (patch) | |
| tree | 4a9999b27058b8efee4ed74cd40f4f16dd97b34f /src/shared | |
| parent | 6ab923c39fd4ac66edb3cf708e3c789cb4a31428 (diff) | |
| parent | 81a5e2143cb7728316e02d24925f853e2db2099a (diff) | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
src/tools/perfparser
Change-Id: Ie5643100e0eb00e0933359dce320169b876f5634
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 1a6cfb0af220926f8b00219c5dd7feb36bcaa0d +Subproject 0319b0acc7a11f9ba84d8708d8e88575470ca75 |