aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qml.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-19 20:28:21 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-08-19 20:28:21 +0000
commitf36f3d0b4bd51985d64ab1a5f38313279bd1b00e (patch)
tree94516bed48815cdda6f2b8bc2dc81b761ffa0f1c /tests/auto/qml/qml.pro
parent23527754d60780ac4830f1acd6a54d3487a2c362 (diff)
parent79349119c66c2237d70fe4c13ebb9fe273ce2f85 (diff)
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/qml/qml.pro')
0 files changed, 0 insertions, 0 deletions