diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-22 10:35:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-22 11:20:29 +0100 |
| commit | 1b4d2741f90d3f4daf79940b9c8713dda0fb7f3d (patch) | |
| tree | 40cee4f6af7bf9a5fc87c43f024f417a5d09e18d /tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | |
| parent | 536868fad50778ec5bf4c6c7269c721b05d8a2d5 (diff) | |
| parent | 84e15a609b37a64baf82ed20f8d4f79474989226 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
Change-Id: Ic1f5e219a255d0613f7654368a5ce3eccb8f0ee9
Diffstat (limited to 'tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp')
0 files changed, 0 insertions, 0 deletions