diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
| commit | 4fabebb332d8409b76e88edc74905f99119f0da4 (patch) | |
| tree | 7dff5241738b7ad5f46bdbbc0c01c2955ee1d5c1 /src/quick/util/qquickanimator.cpp | |
| parent | 561b9323c22a594b402eac343690898d4e9c44d0 (diff) | |
| parent | 131fe1b85311b8ab02498cea5d1dda2188dcdabc (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/quick/util/qquickimageprovider.cpp
Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023
Diffstat (limited to 'src/quick/util/qquickanimator.cpp')
0 files changed, 0 insertions, 0 deletions