diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-04 19:32:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-04 19:32:50 +0100 |
| commit | dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 (patch) | |
| tree | d2609e5bd0f67e9c4b0a2e3a362defcf7549a6ba /demos/mobile/quickhit/Button.qml | |
| parent | ef57010bec52f0d39840e629b2b47f6f56fc337b (diff) | |
| parent | f079636a3ee5538eb79fd4e7e6ffcb0465a015a0 (diff) | |
| download | qtquick1-dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6.05.6.0
Conflicts:
.qmake.conf
Change-Id: Id54f50aa7e6e6ad3c69254a37cff17354092348b
Diffstat (limited to 'demos/mobile/quickhit/Button.qml')
0 files changed, 0 insertions, 0 deletions