diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-15 10:55:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-15 10:57:49 +0100 |
| commit | 365a3ac6ae50eb53253eca92bfdf4c527b3a5c05 (patch) | |
| tree | c6fa0bf4ccf698fa75e2ebc245f95e424438b13a /src/imports/testlib/TestCase.qml | |
| parent | daa866a196962beb6171f847bd6f691f3ae38300 (diff) | |
| parent | 8ff69297eeddc3f5650c4cc5517c7e2eafaf6c59 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/qmldevtools/qmldevtools.pro
tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
Change-Id: I12255c16716bd8a74e7047cdb1f9302a4d1ea827
Diffstat (limited to 'src/imports/testlib/TestCase.qml')
0 files changed, 0 insertions, 0 deletions