diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-11 20:25:01 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-11 20:25:01 +0000 |
commit | 8615db11a61178c5be5c2ef9e373ad0d245888d6 (patch) | |
tree | 04cd2ab41fdfd04cca1eac9f56d8aaaf5abbc23a /src/templates/qquickabstractbutton.cpp | |
parent | b663020c9a60704dc53014522a3faa23892280a0 (diff) | |
parent | 41d9718bc4ac005b82d64db8a4312e7fef7548d9 (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/templates/qquickabstractbutton.cpp')
0 files changed, 0 insertions, 0 deletions