diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-09-25 15:18:07 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-09-25 15:18:07 +0200 |
| commit | 4e101b42238a3c2f421def62af33cb7e32adbf55 (patch) | |
| tree | 5dd7c049951a02e1351f5023101b28498185e030 /src/shared | |
| parent | 90050c05f3b14a93e26a3e731a18c74b43edb212 (diff) | |
| parent | 68359f96a932fad3d230db4039abd9a900816e72 (diff) | |
Merge remote-tracking branch 'origin/11.0'
Conflicts:
src/app/main.cpp
src/libs/extensionsystem/optionsparser.cpp
src/libs/extensionsystem/pluginmanager.cpp
src/libs/extensionsystem/pluginmanager_p.h
src/libs/extensionsystem/pluginspec.h
Change-Id: I81f5872262e4ec7a631505c586d9470570c0453a
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 d361630f727459ea6dccc1ca6cd5ad51162bfb6 +Subproject 12041c01b8247a05faa12e9d1a6678c8ba56afc |