diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:58:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:58:35 +0100 |
| commit | 9500aadc219481d89d32e5c2a2de10b0740c50de (patch) | |
| tree | 2555f3bf593f772637ecc135b90b8778869e48f2 /src/multimedia/controls/qcamerazoomcontrol.h | |
| parent | 7610f6e9ba8b92df6d18b94fcec982064dffacbd (diff) | |
| parent | dd7c19ea9d6be922faca57013b06b0f2b0787169 (diff) | |
| download | qtmultimedia-9500aadc219481d89d32e5c2a2de10b0740c50de.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: If5d9ea0fb6187bb6f74881289ebb15a57eb82e0c
Diffstat (limited to 'src/multimedia/controls/qcamerazoomcontrol.h')
0 files changed, 0 insertions, 0 deletions