diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-07-04 08:29:53 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-07-04 08:53:22 +0200 |
| commit | 91fb0cf1232850f8cb41840d28689bf6bcfd633c (patch) | |
| tree | 337a883dda347f3f0890989c0adefd062a43e851 /src/plugins/texteditor/textmark.h | |
| parent | 1ce044ef7a0c69fbd7841dccd6f4bb7802d1dae4 (diff) | |
| parent | 4180e1b84f43cc39119e003457f76be518588107 (diff) | |
Merge remote-tracking branch 'origin/8.0'
Conflicts:
src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
Change-Id: I5106bb632c2a3a144287097137be45b0894b9ee4
Diffstat (limited to 'src/plugins/texteditor/textmark.h')
0 files changed, 0 insertions, 0 deletions