diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-04 13:35:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-04 13:35:55 +0200 |
| commit | 5211cf2843af606b912e9130d44ee6c82eeb40b0 (patch) | |
| tree | d2a90e480d497edc3bbac367bf974ec93076e409 /src/imports/templates/qtquicktemplates2plugin.cpp | |
| parent | 13bdd61c6597586f62558ca337c193ce03db26cc (diff) | |
| parent | ce7c431fb23157fa5125d1102a594de045818a72 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: I0bc187e2a8edb4e357c1bf114dd9b1977d5c1e45
Diffstat (limited to 'src/imports/templates/qtquicktemplates2plugin.cpp')
0 files changed, 0 insertions, 0 deletions