diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-29 01:00:11 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-29 11:56:00 +0200 |
| commit | 154155f588c89d43362abb58bcf91449c78e3ff8 (patch) | |
| tree | e72e8040684ab1c51c7ef67d9369a253730da6e4 /src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp | |
| parent | 28af6e97e5fe7f844bc85df7af22ce8b7414f5a6 (diff) | |
| parent | e24a4976bebd7ca90deac2b40c08900625773a99 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/corelib/io/qresource.cpp
Change-Id: I54917f72444a621bd08aeaa15f5d17415993144d
Diffstat (limited to 'src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp')
0 files changed, 0 insertions, 0 deletions