diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-04-13 15:59:08 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-04-13 15:59:08 +0200 |
| commit | 2bc37de42b5dd1f0d0a8cea29e5a2cc4926836b5 (patch) | |
| tree | e613605a0c295a2af7010e92d7b5d412654bf137 /src/shared | |
| parent | b1415a0ea58e0860c790b1b5ff5fbd3d4bfdd87a (diff) | |
| parent | 02f2a93503a24d2da3b93db2cbfe8463627cf990 (diff) | |
| download | qt-creator-2bc37de42b5dd1f0d0a8cea29e5a2cc4926836b5.tar.gz | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
src/plugins/python/pipsupport.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/examplesparser.cpp
tests/auto/examples/tst_examples.cpp
Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664
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 0319b0acc7a11f9ba84d8708d8e88575470ca75 +Subproject 289aac0aa1cccb2ef66a17f572aeb59236c6bd2 |