diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 22:09:49 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 22:09:49 +0100 |
| commit | c8427a542bc61d95e4f313f22a0118ccf1e963a4 (patch) | |
| tree | cc9a9c6e31180c50a8d0a2f9b82ca84c9049c741 /tests/auto/quick/qquicklistview/BLACKLIST | |
| parent | 7b7297470cde5645b2ea1db4cec7ac4bec87c1a3 (diff) | |
| parent | 3f2eabc8d90c4ee535cb0a2500e033171e203537 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
tests/auto/qml/qqmlitemmodels/testtypes.h
Change-Id: I2f2f3f47fd873ddd4fd027414654a861b56357f4
Diffstat (limited to 'tests/auto/quick/qquicklistview/BLACKLIST')
0 files changed, 0 insertions, 0 deletions