diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-06 12:54:39 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-03-06 12:54:39 +0000 |
commit | 1d2d771f552ff43a508ff301ff0906d8d61b729f (patch) | |
tree | 6a9ece9596f93f0188489b8b86f8dfaef5e6cc5a /tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp | |
parent | fc7d3fcb17db5e87fcca7b46a668b1c5a0f2ea06 (diff) | |
parent | d8c559c4e2fc0b8051be78bd64b8a8fe80b3b78f (diff) |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp')
0 files changed, 0 insertions, 0 deletions