diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-30 15:41:10 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-30 15:42:09 +0200 |
| commit | c4aa4ffa21c8ce2ca7cf18085a6be17b8e704b27 (patch) | |
| tree | 48ae7a7edacaa1d3c3428ec612eca7122ca751ed /tests/auto/qmltest/listview/tst_listview.qml | |
| parent | 47ffb30a69285d6ced1287f14ff5842a298e60e0 (diff) | |
| parent | 8e1b88e457cbee0000d5956f2ff5a98724c2d3e4 (diff) | |
Merge remote-tracking branch 'origin/stable' into 5.3
Conflicts:
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
Change-Id: I80584b4f7d62cd86d3449e19176118e3bed886c1
Diffstat (limited to 'tests/auto/qmltest/listview/tst_listview.qml')
0 files changed, 0 insertions, 0 deletions