diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-04-18 12:53:45 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-04-18 12:53:45 +0200 |
| commit | 4e6877753aff8378b64552301dd1d13663a7d7c5 (patch) | |
| tree | cbc738f9252e11045bd89bf5cfa93930ef525765 /src/shared | |
| parent | ebfcb8af65c01083412eb63c86f7a8d85a177120 (diff) | |
| parent | f2c6af064b73c25ca11816d054e7d1318068b391 (diff) | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
src/plugins/android/androidrunnerworker.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
Change-Id: I1628528dbc0ffe874b49bbe022da5933b1348057
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 289aac0aa1cccb2ef66a17f572aeb59236c6bd2 +Subproject e002680feb415ee7d26e3a31d70afeef0d50dea |