diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-11-03 13:44:37 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-11-03 13:44:37 +0100 |
| commit | 68388a38dd8e1ec06b48b779543097a9f8ba4156 (patch) | |
| tree | c778c8d651a9b6b3327430319f1b82e808300dba /src/shared | |
| parent | 079906a122cae6dd0511a97c0f175488de5c06b5 (diff) | |
| parent | 8de9892c4e877ea7b46940bfc25f203e789de994 (diff) | |
| download | qt-creator-68388a38dd8e1ec06b48b779543097a9f8ba4156.tar.gz | |
Merge remote-tracking branch 'origin/9.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
Change-Id: I154a9ababa9e166cb06e98652d481fe6234f6399
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 f200b701f7307a2935f37d39db8e192d98ff704 +Subproject 8cfaf76b174a47827eb32255cd1fd1d836a3dd6 |